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

* In "nix-env -i", print a warning if there are multiple derivations

Browse source 
with the same name *and* version number, and pick the first one
  (this means that the order in which channels appear in
  ~/.nix-channels matters).  E.g.:

    $ nix-env ii aterm
    warning: there are multiple derivations named `aterm-2.4.2'; using the first one
    installing `aterm-2.4.2'
This commit is contained in:
Eelco Dolstra 2006-02-17 18:11:45 +00:00
parent 7a3e715980
commit 46f0cb0869
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,23 +217,6 @@ static DrvInfos filterBySelector(EvalState & state,
DrvInfos elems;
PathSet done;
#if 0
/* Filter out the ones we're not interested in. */
for (DrvInfos::const_iterator i = allElems.begin();
i != allElems.end(); ++i)
{
DrvName drvName(i->name);
for (DrvNames::iterator j = selectors.begin();
j != selectors.end(); ++j)
{
if (j->matches(drvName)) {
j->hits++;
elems.push_back(*i);
}
}
}
#endif
for (DrvNames::iterator i = selectors.begin();
i != selectors.end(); ++i)
{
@ -248,30 +231,39 @@ static DrvInfos filterBySelector(EvalState & state,
}
}
/* If `newestOnly', if a selector matches multiple derivations
with the same name, pick the one with the highest version.
If there are multiple derivations with the same name *and*
version, then pick the first one. */
if (newestOnly) {
/* Map from package names to derivations. */
map<string, DrvInfo> newest;
StringSet multiple;
for (DrvInfos::const_iterator j = matches.begin();
j != matches.end(); ++j)
{
DrvName drvName(j->name);
map<string, DrvInfo>::iterator k = newest.find(drvName.name);
if (k != newest.end())
if (compareVersions(drvName.version, DrvName(k->second.name).version) > 0)
newest[drvName.name] = *j;
else
;
else
if (k != newest.end()) {
int d = compareVersions(drvName.version, DrvName(k->second.name).version);
if (d > 0) newest[drvName.name] = *j;
else if (d == 0) multiple.insert(j->name);
} else
newest[drvName.name] = *j;
}
matches.clear();
for (map<string, DrvInfo>::iterator j = newest.begin();
j != newest.end(); ++j)
j != newest.end(); ++j) {
if (multiple.find(j->second.name) != multiple.end())
printMsg(lvlInfo,
format("warning: there are multiple derivations named `%1%'; using the first one")
% j->second.name);
matches.push_back(j->second);
}
}
/* Insert only those elements in the final list that we
haven't inserted before. */