lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Fixed a bug in the upgrade operation.

Browse source
This commit is contained in:
Eelco Dolstra 2003-12-23 22:13:36 +00:00
parent 833f2fc92d
commit 392b7e0f8e
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/nix-env/main.cc
View file

@ -439,6 +439,7 @@ static void upgradeDerivations(EvalState & state,
loadDerivations(state, nePath, availDrvs); loadDerivations(state, nePath, availDrvs);
/* Go through all installed derivations. */ /* Go through all installed derivations. */
DrvInfos newDrvs;
for (DrvInfos::iterator i = installedDrvs.begin(); for (DrvInfos::iterator i = installedDrvs.begin();
i != installedDrvs.end(); ++i) i != installedDrvs.end(); ++i)
{ {
@ -455,31 +456,32 @@ static void upgradeDerivations(EvalState & state,
break; break;
} }
} }
if (!upgrade) continue;
/* If yes, find the derivation in the input Nix expression /* If yes, find the derivation in the input Nix expression
with the same name and the highest version number. */ with the same name and the highest version number. */
DrvInfos::iterator bestDrv = i; DrvInfos::iterator bestDrv = i;
DrvName bestName = drvName; DrvName bestName = drvName;
for (DrvInfos::iterator j = availDrvs.begin(); if (upgrade) {
j != availDrvs.end(); ++j) for (DrvInfos::iterator j = availDrvs.begin();
{ j != availDrvs.end(); ++j)
DrvName newName(j->second.name); {
if (newName.name == bestName.name && DrvName newName(j->second.name);
compareVersions(newName.version, bestName.version) > 0) if (newName.name == bestName.name &&
bestDrv = j; compareVersions(newName.version, bestName.version) > 0)
bestDrv = j;
}
} }
if (bestDrv != i) { if (bestDrv != i) {
printMsg(lvlInfo, printMsg(lvlInfo,
format("upgrading `%1%' to `%2%'") format("upgrading `%1%' to `%2%'")
% i->second.name % bestDrv->second.name); % i->second.name % bestDrv->second.name);
installedDrvs.erase(i);
installedDrvs.insert(*bestDrv);
} }
newDrvs.insert(*bestDrv);
} }
createUserEnv(state, installedDrvs, linkPath); createUserEnv(state, newDrvs, linkPath);
} }