From 5943f41b8bd95b8559cb6768bb0a1151f6bee68d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Nov 2012 18:25:12 +0100
Subject: [PATCH] queryMissing(): Handle partially valid derivations

---
 src/libstore/misc.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index ecba0c419d..899e4764c1 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -126,11 +126,12 @@ void queryMissing(StoreAPI & store, const PathSet & targets,
             if (settings.useSubstitutes) {
                 foreach (DerivationOutputs::iterator, j, drv.outputs) {
                     if (!wantOutput(j->first, i2.second)) continue;
-                    if (!store.isValidPath(j->second.path) &&
-                        infos.find(j->second.path) == infos.end())
-                        mustBuild = true;
-                    else
-                        outputs.insert(j->second.path);
+                    if (!store.isValidPath(j->second.path)) {
+                        if (infos.find(j->second.path) == infos.end())
+                            mustBuild = true;
+                        else
+                            outputs.insert(j->second.path);
+                    }
                 }
             } else
                 mustBuild = true;