From a3e6415ba8cf1b8d2a1db40c06997d997eac8afc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue, 12 Dec 2006 23:05:01 +0000
Subject: * New primop builtins.filterSource, which can be used to filter files
   from a source directory.  All files for which a predicate function  
 returns true are copied to the store.  Typical example is to leave   out the
 .svn directory:

    stdenv.mkDerivation {
      ...
      src = builtins.filterSource
        (path: baseNameOf (toString path) != ".svn")
        ./source-dir;
      # as opposed to
      #   src = ./source-dir;
    }

  This is important because the .svn directory influences the hash in
  a rather unpredictable and variable way.
---
 src/nix-worker/nix-worker.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/nix-worker/nix-worker.cc')

diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc
index 0be4b8e64cc4..17fbbf264693 100644
--- a/src/nix-worker/nix-worker.cc
+++ b/src/nix-worker/nix-worker.cc
@@ -240,6 +240,7 @@ static void performOp(Source & from, Sink & to, unsigned int op)
         string hashAlgo = readString(from);
         
         Path tmp = createTempDir();
+        AutoDelete delTmp(tmp);
         Path tmp2 = tmp + "/" + baseName;
         restorePath(tmp2, from);
 
@@ -248,8 +249,6 @@ static void performOp(Source & from, Sink & to, unsigned int op)
         stopWork();
         
         writeString(path, to);
-            
-        deletePath(tmp);
         break;
     }
 
-- 
cgit 1.4.1