soenkehahn/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-store -r: Get rid of an unnecessary call to buildPaths/ensurePaths

Browse source
This commit is contained in:
Eelco Dolstra 2012-10-02 16:00:09 -04:00
parent 8e3a7bd712
commit cf46f19444
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/nix-store/nix-store.cc
View file

@ -59,10 +59,10 @@ static Path useDeriver(Path path)
/* Realise the given path. For a derivation that means build it; for /* Realise the given path. For a derivation that means build it; for
other paths it means ensure their validity. */ other paths it means ensure their validity. */
static PathSet realisePath(const Path & path) static PathSet realisePath(const Path & path, bool build = true)
{ {
if (isDerivation(path)) { if (isDerivation(path)) {
store->buildPaths(singleton<PathSet>(path)); if (build) store->buildPaths(singleton<PathSet>(path));
Derivation drv = derivationFromPath(*store, path); Derivation drv = derivationFromPath(*store, path);
rootNr++; rootNr++;
@ -83,7 +83,7 @@ static PathSet realisePath(const Path & path)
} }
else { else {
store->ensurePath(path); if (build) store->ensurePath(path);
return singleton<PathSet>(path); return singleton<PathSet>(path);
} }
} }
@ -110,7 +110,7 @@ static void opRealise(Strings opFlags, Strings opArgs)
store->buildPaths(paths); store->buildPaths(paths);
foreach (Paths::iterator, i, opArgs) { foreach (Paths::iterator, i, opArgs) {
PathSet paths = realisePath(*i); PathSet paths = realisePath(*i, false);
foreach (PathSet::iterator, j, paths) foreach (PathSet::iterator, j, paths)
cout << format("%1%\n") % *j; cout << format("%1%\n") % *j;
} }