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

printMissing(): Propagate store argument

Browse source
This commit is contained in:
Eelco Dolstra 2016-01-28 15:16:06 +01:00
parent ca6d287b33
commit 9f14d7d33a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libmain/shared.cc
View file

@ -52,17 +52,17 @@ void printMissing(StoreAPI & store, const PathSet & paths)
unsigned long long downloadSize, narSize;
PathSet willBuild, willSubstitute, unknown;
queryMissing(store, paths, willBuild, willSubstitute, unknown, downloadSize, narSize);
printMissing(willBuild, willSubstitute, unknown, downloadSize, narSize);
printMissing(store, willBuild, willSubstitute, unknown, downloadSize, narSize);
}
void printMissing(const PathSet & willBuild,
void printMissing(StoreAPI & store, const PathSet & willBuild,
const PathSet & willSubstitute, const PathSet & unknown,
unsigned long long downloadSize, unsigned long long narSize)
{
if (!willBuild.empty()) {
printMsg(lvlInfo, format("these derivations will be built:"));
Paths sorted = topoSortPaths(*store, willBuild);
Paths sorted = topoSortPaths(store, willBuild);
reverse(sorted.begin(), sorted.end());
for (auto & i : sorted)
printMsg(lvlInfo, format(" %1%") % i);

2
src/libmain/shared.hh
View file

@ -35,7 +35,7 @@ void printGCWarning();
void printMissing(StoreAPI & store, const PathSet & paths);
void printMissing(const PathSet & willBuild,
void printMissing(StoreAPI & store, const PathSet & willBuild,
const PathSet & willSubstitute, const PathSet & unknown,
unsigned long long downloadSize, unsigned long long narSize);

2
src/nix-store/nix-store.cc
View file

@ -140,7 +140,7 @@ static void opRealise(Strings opFlags, Strings opArgs)
}
if (settings.get("print-missing", true))
printMissing(willBuild, willSubstitute, unknown, downloadSize, narSize);
printMissing(*store, willBuild, willSubstitute, unknown, downloadSize, narSize);
if (dryRun) return;