03/09: daemon: Fix --repair failure on multiple-output derivations.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1a9574e3a73e6ec1641c7238d87e45d00b862283
Author: Eelco Dolstra <address@hidden>
Date:   Wed Jan 6 21:49:32 2016 +0100

    daemon: Fix --repair failure on multiple-output derivations.
    
    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
    
    Co-authored-by: Ludovic Courtès <address@hidden>
---
 nix/libstore/build.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index f0f60d7..bbcb55a 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -1106,8 +1106,10 @@ void DerivationGoal::repairClosure()
 
     /* Get the output closure. */
     PathSet outputClosure;
-    foreach (DerivationOutputs::iterator, i, drv.outputs)
+    foreach (DerivationOutputs::iterator, i, drv.outputs) {
+        if (!wantOutput(i->first, wantedOutputs)) continue;
         computeFSClosure(worker.store, i->second.path, outputClosure);
+    }
 
     /* Filter out our own outputs (which we have already checked). */
     foreach (DerivationOutputs::iterator, i, drv.outputs)