mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix --repair failure on multiple-output derivations

Browse source 
If repair found a corrupted/missing path that depended on a
multiple-output derivation, and some of the outputs of the latter were
not present, it failed with a message like

  error: path ‘/nix/store/cnfn9d5fjys1y93cz9shld2xwaibd7nn-bash-4.3-p42-doc’ is not valid
This commit is contained in:
Eelco Dolstra 2016-01-06 21:49:32 +01:00
parent d2c0958e1e
commit caaaff3954
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -1123,8 +1123,10 @@ void DerivationGoal::repairClosure()
/* Get the output closure. */ /* Get the output closure. */
PathSet outputClosure; PathSet outputClosure;
for (auto & i : drv->outputs) for (auto & i : drv->outputs) {
if (!wantOutput(i.first, wantedOutputs)) continue;
computeFSClosure(worker.store, i.second.path, outputClosure); computeFSClosure(worker.store, i.second.path, outputClosure);
}
/* Filter out our own outputs (which we have already checked). */ /* Filter out our own outputs (which we have already checked). */
for (auto & i : drv->outputs) for (auto & i : drv->outputs)