maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* querySubstitutablePathInfo: work properly when run via the daemon.

Browse source 
* --dry-run: print the paths that we don't know how to build/substitute.
This commit is contained in:
Eelco Dolstra 2008-08-04 11:44:50 +00:00
parent b3c26180e3
commit 03427e76f1
7 changed files with 49 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -531,7 +531,7 @@ static void queryInstSources(EvalState & state,
static void printMissing(EvalState & state, const DrvInfos & elems)
{
PathSet targets, willBuild, willSubstitute;
PathSet targets, willBuild, willSubstitute, unknown;
for (DrvInfos::const_iterator i = elems.begin(); i != elems.end(); ++i) {
Path drvPath = i->queryDrvPath(state);
if (drvPath != "")
@ -540,17 +540,24 @@ static void printMissing(EvalState & state, const DrvInfos & elems)
targets.insert(i->queryOutPath(state));
}
queryMissing(targets, willBuild, willSubstitute);
queryMissing(targets, willBuild, willSubstitute, unknown);
if (!willBuild.empty()) {
printMsg(lvlInfo, format("the following derivations will be built:"));
for (PathSet::iterator i = willBuild.begin(); i != willBuild.end(); ++i)
foreach (PathSet::iterator, i, willBuild)
printMsg(lvlInfo, format(" %1%") % *i);
}
if (!willSubstitute.empty()) {
printMsg(lvlInfo, format("the following paths will be substituted:"));
for (PathSet::iterator i = willSubstitute.begin(); i != willSubstitute.end(); ++i)
printMsg(lvlInfo, format("the following paths will be downloaded/copied:"));
foreach (PathSet::iterator, i, willSubstitute)
printMsg(lvlInfo, format(" %1%") % *i);
}
if (!unknown.empty()) {
printMsg(lvlInfo, format("don't know how to build the following paths%1%:")
% (readOnlyMode ? " (may be caused by read-only store access)" : ""));
foreach (PathSet::iterator, i, unknown)
printMsg(lvlInfo, format(" %1%") % *i);
}
}