From 5b1052663a35940fc99ae6a8fcf6e707ae939fef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 4 Aug 2008 13:11:09 +0000
Subject: [PATCH] * Always show what paths we're going to build/download (as in
   --dry-run).  Maybe there should be an option to turn this on/off?

---
 src/nix-env/nix-env.cc | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index 085d83a5b..c3fe2d089 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -617,11 +617,10 @@ static void installDerivations(Globals & globals,
     for (DrvInfos::iterator i = newElems.begin(); i != newElems.end(); ++i)
         printMsg(lvlInfo,
             format("installing `%1%'") % i->name);
-        
-    if (globals.dryRun) {
-        printMissing(globals.state, newElems);
-        return;
-    }
+    
+    printMissing(globals.state, newElems);
+    
+    if (globals.dryRun) return;
 
     createUserEnv(globals.state, allElems,
         profile, globals.keepDerivations);
@@ -721,10 +720,9 @@ static void upgradeDerivations(Globals & globals,
         } else newElems.push_back(*i);
     }
     
-    if (globals.dryRun) {
-        printMissing(globals.state, newElems);
-        return;
-    }
+    printMissing(globals.state, newElems);
+    
+    if (globals.dryRun) return;
 
     createUserEnv(globals.state, newElems,
         globals.profile, globals.keepDerivations);