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

* In nix-env --query --status', determine the I' bit by looking at

Browse source 
the output path of a derivation, not the path of its store
  expression.  This ensures that changes that affect the path of the
  store expression but not the output path, do not affect the
  `installed' state of a derivation.
This commit is contained in:
Eelco Dolstra 2004-01-15 14:43:00 +00:00
parent 9a404e45c9
commit 55e11bc0d3
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -600,9 +600,15 @@ static void opQuery(Globals & globals,
DrvInfos installed; DrvInfos installed;
queryInstalled(globals.state, installed, globals.linkPath); queryInstalled(globals.state, installed, globals.linkPath);
PathSet installedPaths; /* output paths of installed drvs */
for (DrvInfos::iterator i = installed.begin();
i != installed.end(); ++i)
installedPaths.insert(i->second.outPath);
for (DrvInfos::iterator i = drvs.begin(); i != drvs.end(); ++i) { for (DrvInfos::iterator i = drvs.begin(); i != drvs.end(); ++i) {
cout << format("%1%%2% %3%\n") cout << format("%1%%2% %3%\n")
% (installed.find(i->first) != installed.end() ? 'I' : '-') % (installedPaths.find(i->second.outPath)
!= installedPaths.end() ? 'I' : '-')
% (isValidPath(i->second.outPath) ? 'P' : '-') % (isValidPath(i->second.outPath) ? 'P' : '-')
% i->second.name; % i->second.name;
} }