diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-23T18·55-0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-23T18·55-0400 |
commit | b09b87321c058f691fcf64babe56620277b68e63 (patch) | |
tree | aa1534bd47f8713206b718f7873fbadbb2ef2e5a | |
parent | 107505e13ac83850fe01ef3e1a35e5bb2ab1ef52 (diff) |
nix-store --export: Export paths in topologically sorted order
Fixes #118.
-rw-r--r-- | src/libstore/store-api.hh | 2 | ||||
-rw-r--r-- | src/nix-store/nix-store.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 053bece7a3a3..a82fe3221639 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -328,7 +328,7 @@ Path addPermRoot(StoreAPI & store, const Path & storePath, /* Sort a set of paths topologically under the references relation. - If p refers to q, then p follows q in this list. */ + If p refers to q, then p preceeds q in this list. */ Paths topoSortPaths(StoreAPI & store, const PathSet & paths); diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 151ed97e4b8b..5bd8558361df 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -694,7 +694,9 @@ static void opExport(Strings opFlags, Strings opArgs) else throw UsageError(format("unknown flag `%1%'") % *i); FdSink sink(STDOUT_FILENO); - exportPaths(*store, opArgs, sign, sink); + Paths sorted = topoSortPaths(*store, PathSet(opArgs.begin(), opArgs.end())); + reverse(sorted.begin(), sorted.end()); + exportPaths(*store, sorted, sign, sink); } |