nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 20:20:58 +01:00
Code Activity

Merged R9063

Browse source
This commit is contained in:
Wouter den Breejen 2007-10-08 10:41:41 +00:00
parent 546ca6e8bc
commit 00602dd20c
8 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -730,7 +730,10 @@ static void upgradeDerivations(Globals & globals,
DrvName drvName(i->name);
MetaInfo meta = i->queryMetaInfo(globals.state);
if (meta["keep"] == "true") continue;
if (meta["keep"] == "true") {
newElems.push_back(*i);
continue;
}
/* Find the derivation in the input Nix expression with the
same name that satisfies the version constraints specified
@ -1222,7 +1225,7 @@ static void opQuery(Globals & globals,
cout.flush();
} catch (AssertionError & e) {
/* !!! hm, maybe we should give some sort of warning here? */
printMsg(lvlTalkative, format("skipping derivation named `%1%' which gives an assertion failure") % i->name);
}
}