mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make --repair work on Darwin

Browse source 
Mac OS X doesn't allow renaming a read-only directory.

http://hydra.nixos.org/build/9113895
This commit is contained in:
Eelco Dolstra 2014-02-17 23:09:48 +01:00
parent dfbcb7c403
commit b6def5b542
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build.cc
View file

@ -2810,12 +2810,12 @@ void SubstitutionGoal::finished()
return; return;
} }
canonicalisePathMetaData(destPath, -1);
worker.store.optimisePath(destPath); // FIXME: combine with hashPath()
if (repair) replaceValidPath(storePath, destPath); if (repair) replaceValidPath(storePath, destPath);
canonicalisePathMetaData(storePath, -1);
worker.store.optimisePath(storePath); // FIXME: combine with hashPath()
ValidPathInfo info2; ValidPathInfo info2;
info2.path = storePath; info2.path = storePath;
info2.hash = hash.first; info2.hash = hash.first;