From ca50c83fbb8f3bfbbcc60203a518d4e5a7aa8349 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 23 Nov 2009 21:21:29 +0000
Subject:

---
 src/libstore/gc.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/libstore/gc.cc')

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index d3cac06e4..88ddad822 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -512,6 +512,11 @@ bool LocalStore::tryToDelete(GCState & state, const Path & path)
                 }
         }
 
+        /* If gc-keep-derivations and gc-keep-outputs are both set,
+           it's possible that the path has already been deleted (due
+           to the recursion below), so bail out. */
+        if (!pathExists(path)) return true;
+
         /* If gc-keep-outputs is set, then don't delete this path if
            its deriver is not garbage.  !!! This is somewhat buggy,
            since there might be multiple derivers, but the database
-- 
cgit v1.2.3