From 4d2946c516aefd26daec8b2f4c4248e43ce85a62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 28 Jun 2004 13:51:24 +0000
Subject: * In a realisation goal, check the result of the corresponding  
 normalisation goal.

---
 src/libstore/normalise.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/libstore/normalise.cc b/src/libstore/normalise.cc
index 6fc3bdfc3..a6bac62bf 100644
--- a/src/libstore/normalise.cc
+++ b/src/libstore/normalise.cc
@@ -1254,6 +1254,7 @@ void RealisationGoal::init()
     trace("init");
 
     if (querySuccessor(nePath, nfPath)) {
+        nrFailed = 0;
         isNormalised();
         return;
     }
@@ -1277,6 +1278,11 @@ void RealisationGoal::isNormalised()
 {
     trace("has been normalised");
 
+    if (nrFailed != 0) {
+        amDone(false);
+        return;
+    }
+
     nfPath = queryNormalForm(nePath);
 
     /* Now make sure that the store expression exists.  If it doesn't,
-- 
cgit v1.2.3