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

* Always show what paths we're going to build/download (as in

Browse source 
--dry-run).  Maybe there should be an option to turn this on/off?
This commit is contained in:
Eelco Dolstra 2008-08-04 13:11:09 +00:00
parent c4f98941ed
commit 5b1052663a
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nix-env/nix-env.cc
View file

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