diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-04T16·22+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-04T16·22+0000 |
commit | adaf64a99b0a882249e35768c3f4fe3de104cbb2 (patch) | |
tree | 89b3becb5f9197f3d453355262549ea8bf08b9d2 /src/libstore/gc.cc | |
parent | 63227d434cefaa9faeb14afe28ebeb9b2d449ee2 (diff) | |
parent | 9936da6b546d1ce643eca21ac76c6e7d568de1c2 (diff) |
* Merge the multiple-outputs-sandbox branch (svn merge --reintegrate
^/nix/branches/multiple-outputs-sandbox). Multiple output support still isn't complete, but it wasn't complete in the trunk either, so it doesn't hurt.
Diffstat (limited to 'src/libstore/gc.cc')
-rw-r--r-- | src/libstore/gc.cc | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index feaab573ef30..14c8ba0bfe90 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -371,36 +371,6 @@ static void addAdditionalRoots(StoreAPI & store, PathSet & roots) } -static void dfsVisit(StoreAPI & store, const PathSet & paths, - const Path & path, PathSet & visited, Paths & sorted) -{ - if (visited.find(path) != visited.end()) return; - visited.insert(path); - - PathSet references; - if (store.isValidPath(path)) - store.queryReferences(path, references); - - foreach (PathSet::iterator, i, references) - /* Don't traverse into paths that don't exist. That can - happen due to substitutes for non-existent paths. */ - if (*i != path && paths.find(*i) != paths.end()) - dfsVisit(store, paths, *i, visited, sorted); - - sorted.push_front(path); -} - - -Paths topoSortPaths(StoreAPI & store, const PathSet & paths) -{ - Paths sorted; - PathSet visited; - foreach (PathSet::const_iterator, i, paths) - dfsVisit(store, paths, *i, visited, sorted); - return sorted; -} - - struct GCLimitReached { }; |