diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-02-14 13:08:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 13:08:02 +0100 |
| commit | d8fe447139624082681e477900b0f7a798ff375a (patch) | |
| tree | 18ac8e1ca283ba1f0fbcc89ab8ffa783901de4c1 | |
| parent | 25722bd39aece28a3ab8ef05fa14cece37b8c8fe (diff) | |
| parent | 5f1891b795c4c4daac5336d1ec60c94f521ede1d (diff) | |
Merge pull request #2579 from catern/dumpdb
nix-store: make --dump-db take a list of paths to dump
| -rw-r--r-- | doc/manual/command-ref/nix-store.xml | 8 | ||||
| -rw-r--r-- | src/nix-store/nix-store.cc | 15 |
2 files changed, 18 insertions, 5 deletions
diff --git a/doc/manual/command-ref/nix-store.xml b/doc/manual/command-ref/nix-store.xml index 41a04f265..d73cb92ee 100644 --- a/doc/manual/command-ref/nix-store.xml +++ b/doc/manual/command-ref/nix-store.xml @@ -1282,6 +1282,7 @@ ktorrent-2.2.1/NEWS <cmdsynopsis> <command>nix-store</command> <arg choice='plain'><option>--dump-db</option></arg> + <arg rep='repeat'><replaceable>paths</replaceable></arg> </cmdsynopsis> </refsection> @@ -1292,6 +1293,13 @@ Nix database to standard output. It can be loaded into an empty Nix store using <option>--load-db</option>. This is useful for making backups and when migrating to different database schemas.</para> +<para>By default, <option>--dump-db</option> will dump the entire Nix +database. When one or more store paths is passed, only the subset of +the Nix database for those store paths is dumped. As with +<option>--export</option>, the user is responsible for passing all the +store paths for a closure. See <option>--export</option> for an +example.</para> + </refsection> </refsection> diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index a9ad14762..33138baff 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -485,11 +485,16 @@ static void opReadLog(Strings opFlags, Strings opArgs) static void opDumpDB(Strings opFlags, Strings opArgs) { if (!opFlags.empty()) throw UsageError("unknown flag"); - if (!opArgs.empty()) - throw UsageError("no arguments expected"); - PathSet validPaths = store->queryAllValidPaths(); - for (auto & i : validPaths) - cout << store->makeValidityRegistration({i}, true, true); + if (!opArgs.empty()) { + for (auto & i : opArgs) + i = store->followLinksToStorePath(i); + for (auto & i : opArgs) + cout << store->makeValidityRegistration({i}, true, true); + } else { + PathSet validPaths = store->queryAllValidPaths(); + for (auto & i : validPaths) + cout << store->makeValidityRegistration({i}, true, true); + } } |