From 7a108d904e9d3bb9ef94487c37b35a050c315a52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 31 Aug 2017 17:57:04 +0200
Subject: [PATCH] Fix verbosity level for nix build --dry-run

---
 src/libmain/shared.cc   | 24 ++++++++++++------------
 src/libmain/shared.hh   |  4 ++--
 src/nix/build.cc        |  2 +-
 src/nix/installables.cc |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index aa28ff2e5..6393d80bb 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -34,40 +34,40 @@ void printGCWarning()
 }
 
 
-void printMissing(ref<Store> store, const PathSet & paths)
+void printMissing(ref<Store> store, const PathSet & paths, Verbosity lvl)
 {
     unsigned long long downloadSize, narSize;
     PathSet willBuild, willSubstitute, unknown;
     store->queryMissing(paths, willBuild, willSubstitute, unknown, downloadSize, narSize);
-    printMissing(store, willBuild, willSubstitute, unknown, downloadSize, narSize);
+    printMissing(store, willBuild, willSubstitute, unknown, downloadSize, narSize, lvl);
 }
 
 
 void printMissing(ref<Store> store, const PathSet & willBuild,
     const PathSet & willSubstitute, const PathSet & unknown,
-    unsigned long long downloadSize, unsigned long long narSize)
+    unsigned long long downloadSize, unsigned long long narSize, Verbosity lvl)
 {
     if (!willBuild.empty()) {
-        printInfo(format("these derivations will be built:"));
+        printMsg(lvl, "these derivations will be built:");
         Paths sorted = store->topoSortPaths(willBuild);
         reverse(sorted.begin(), sorted.end());
         for (auto & i : sorted)
-            printInfo(format("  %1%") % i);
+            printMsg(lvl, fmt("  %s", i));
     }
 
     if (!willSubstitute.empty()) {
-        printInfo(format("these paths will be fetched (%.2f MiB download, %.2f MiB unpacked):")
-            % (downloadSize / (1024.0 * 1024.0))
-            % (narSize / (1024.0 * 1024.0)));
+        printMsg(lvl, fmt("these paths will be fetched (%.2f MiB download, %.2f MiB unpacked):",
+                downloadSize / (1024.0 * 1024.0),
+                narSize / (1024.0 * 1024.0)));
         for (auto & i : willSubstitute)
-            printInfo(format("  %1%") % i);
+            printMsg(lvl, fmt("  %s", i));
     }
 
     if (!unknown.empty()) {
-        printInfo(format("don't know how to build these paths%1%:")
-            % (settings.readOnlyMode ? " (may be caused by read-only store access)" : ""));
+        printMsg(lvl, fmt("don't know how to build these paths%s:",
+                (settings.readOnlyMode ? " (may be caused by read-only store access)" : "")));
         for (auto & i : unknown)
-            printInfo(format("  %1%") % i);
+            printMsg(lvl, fmt("  %s", i));
     }
 }
 
diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
index becf25873..2a1e42dd9 100644
--- a/src/libmain/shared.hh
+++ b/src/libmain/shared.hh
@@ -35,11 +35,11 @@ void printGCWarning();
 
 class Store;
 
-void printMissing(ref<Store> store, const PathSet & paths);
+void printMissing(ref<Store> store, const PathSet & paths, Verbosity lvl = lvlInfo);
 
 void printMissing(ref<Store> store, const PathSet & willBuild,
     const PathSet & willSubstitute, const PathSet & unknown,
-    unsigned long long downloadSize, unsigned long long narSize);
+    unsigned long long downloadSize, unsigned long long narSize, Verbosity lvl = lvlInfo);
 
 string getArg(const string & opt,
     Strings::iterator & i, const Strings::iterator & end);
diff --git a/src/nix/build.cc b/src/nix/build.cc
index cc96ac48a..4239dd3ff 100644
--- a/src/nix/build.cc
+++ b/src/nix/build.cc
@@ -25,7 +25,7 @@ struct CmdBuild : MixDryRun, InstallablesCommand
     {
         auto paths = toStorePaths(store, dryRun ? DryRun : Build);
 
-        printInfo("build result: %s", showPaths(paths));
+        printError("build result: %s", showPaths(paths));
     }
 };
 
diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index bdd273d50..fdb6004fb 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -228,7 +228,7 @@ PathSet InstallablesCommand::toStorePaths(ref<Store> store, ToStorePathsMode mod
         }
 
     if (mode == DryRun)
-        printMissing(store, buildables);
+        printMissing(store, buildables, lvlError);
     else if (mode == Build)
         store->buildPaths(buildables);