From 23960e92df736d3c87db861fcaf2dd7981cfc4ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Jun 2006 18:13:33 +0000 Subject: [PATCH] * Minor cleanup. --- src/libstore/store.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/libstore/store.cc b/src/libstore/store.cc index 4bf62570e..47adea14a 100644 --- a/src/libstore/store.cc +++ b/src/libstore/store.cc @@ -707,14 +707,12 @@ static Path _addToStore(bool fixed, bool recursive, if (!readOnlyMode) addTempRoot(dstPath); - if (!readOnlyMode && !isValidPath(dstPath)) { + if (!readOnlyMode && !isValidPath(dstPath)) { /* The first check above is an optimisation to prevent unnecessary lock acquisition. */ - PathSet lockPaths; - lockPaths.insert(dstPath); - PathLocks outputLock(lockPaths); + PathLocks outputLock(singleton(dstPath)); if (!isValidPath(dstPath)) { @@ -764,9 +762,7 @@ Path addTextToStore(const string & suffix, const string & s, if (!readOnlyMode && !isValidPath(dstPath)) { - PathSet lockPaths; - lockPaths.insert(dstPath); - PathLocks outputLock(lockPaths); + PathLocks outputLock(singleton(dstPath)); if (!isValidPath(dstPath)) {