* Allow the output/expression id to be forced to a certain

  value; this potentially dangerous feature enables better 
  sharing for those paths for which the content is known in 
  advance (e.g., because a content hash is given).
* Fast builds: if we can expand all output paths of a derive 
  expression, we don't have to build.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/normalise.cc b/src/normalise.cc
index fcb9c4d0d34d..d06c8bf3608d 100644
--- a/src/normalise.cc
+++ b/src/normalise.cc
@@ -88,19 +88,18 @@ Slice normaliseFState(FSId id)
 
     /* We can skip running the builder if we can expand all output
        paths from their ids. */
-    bool fastBuild = false;
-#if 0
+    bool fastBuild = true;
     for (OutPaths::iterator i = outPaths.begin(); 
          i != outPaths.end(); i++)
     {
         try {
             expandId(i->second, i->first);
-        } catch (...) {
+        } catch (Error & e) {
+            debug(format("fast build failed: %1%") % e.what());
             fastBuild = false;
             break;
         }
     }
-#endif
 
     if (!fastBuild) {