about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-11-13T18·19+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-11-13T18·19+0000
commitf459a5bb3a7142dee5d82c5d385bc3c4654c8e2c (patch)
treed6dbd6bf7c941768745ffd2d2085d7dacec3d499
parente2a70b7ec04db604e9eaadfa6446bd360473163a (diff)
* Remove the undocumented `noscan' feature. It's no longer necessary
  now that reference scanning is sufficiently streamy.

-rw-r--r--src/libstore/build.cc27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 82f713c8c8c7..7058bd12b35b 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1479,21 +1479,18 @@ void DerivationGoal::computeClosure()
 
 	/* For this output path, find the references to other paths contained
 	   in it. */
-        PathSet references;
-        if (!pathExists(path + "/nix-support/no-scan")) {
-            references = scanForReferences(path, allPaths);
-
-            /* For debugging, print out the referenced and
-               unreferenced paths. */
-            for (PathSet::iterator i = inputPaths.begin();
-                 i != inputPaths.end(); ++i)
-            {
-                PathSet::iterator j = references.find(*i);
-                if (j == references.end())
-                    debug(format("unreferenced input: `%1%'") % *i);
-                else
-                    debug(format("referenced input: `%1%'") % *i);
-            }
+        PathSet references = scanForReferences(path, allPaths);
+
+        /* For debugging, print out the referenced and unreferenced
+           paths. */
+        for (PathSet::iterator i = inputPaths.begin();
+             i != inputPaths.end(); ++i)
+        {
+            PathSet::iterator j = references.find(*i);
+            if (j == references.end())
+                debug(format("unreferenced input: `%1%'") % *i);
+            else
+                debug(format("referenced input: `%1%'") % *i);
         }
 
         allReferences[path] = references;