lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Minor cleanup.

Browse source
This commit is contained in:
Eelco Dolstra 2006-06-01 18:13:33 +00:00
parent 2d456fc35a
commit 23960e92df
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/store.cc
View file

@ -707,14 +707,12 @@ static Path _addToStore(bool fixed, bool recursive,
if (!readOnlyMode) addTempRoot(dstPath); if (!readOnlyMode) addTempRoot(dstPath);
if (!readOnlyMode && !isValidPath(dstPath)) { if (!readOnlyMode && !isValidPath(dstPath)) {
/* The first check above is an optimisation to prevent /* The first check above is an optimisation to prevent
unnecessary lock acquisition. */ unnecessary lock acquisition. */
PathSet lockPaths; PathLocks outputLock(singleton<PathSet, Path>(dstPath));
lockPaths.insert(dstPath);
PathLocks outputLock(lockPaths);
if (!isValidPath(dstPath)) { if (!isValidPath(dstPath)) {
@ -764,9 +762,7 @@ Path addTextToStore(const string & suffix, const string & s,
if (!readOnlyMode && !isValidPath(dstPath)) { if (!readOnlyMode && !isValidPath(dstPath)) {
PathSet lockPaths; PathLocks outputLock(singleton<PathSet, Path>(dstPath));
lockPaths.insert(dstPath);
PathLocks outputLock(lockPaths);
if (!isValidPath(dstPath)) { if (!isValidPath(dstPath)) {