From 2923b55f9d67bda340053a27e08f7bcddc025f7c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 13:08:27 -0400 Subject: [PATCH] Delete paths in a component in topologically sorted order The outputs of a derivation can refer to each other (even though they cannot have cycles), so they have to be deleted in the right order. http://hydra.nixos.org/build/3026118 --- src/libstore/gc.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 0e0c15934..dc1de48ea 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -454,6 +454,7 @@ bool LocalStore::tryToDelete(GCState & state, const Path & path) is, we can delete the elements of ‘paths’ only if all referrers of ‘paths’ are garbage. */ PathSet paths, referrers; + Paths pathsSorted; if (isValidPath(path)) { @@ -516,7 +517,8 @@ bool LocalStore::tryToDelete(GCState & state, const Path & path) } /* The paths are garbage, so delete them. */ - foreach (PathSet::iterator, i, paths) { + pathsSorted = topoSortPaths(*this, paths); + foreach (Paths::iterator, i, pathsSorted) { if (shouldDelete(state.options.action)) { /* If it's a valid path that's not a regular file or