From 9f14d7d33a0fa2ea9a9a135664a77445972738a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 28 Jan 2016 15:16:06 +0100 Subject: printMissing(): Propagate store argument --- src/libmain/shared.cc | 6 +++--- src/libmain/shared.hh | 2 +- src/nix-store/nix-store.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index a6e8f352a0ab..5106739c81ce 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -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); diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh index 65b288e1ff3e..8e756bd5e842 100644 --- a/src/libmain/shared.hh +++ b/src/libmain/shared.hh @@ -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); diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index b49ebd09475c..22b3be27aa79 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -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; -- cgit 1.4.1