mirror of
https://github.com/NixOS/nix.git
synced 2025-11-12 21:46:01 +01:00
Move exportPaths() / importPaths() out of the Store class
This commit is contained in:
parent
5e46df973f
commit
fe5b669534
6 changed files with 57 additions and 49 deletions
|
|
@ -11,6 +11,7 @@
|
|||
#include "nix/store/globals.hh"
|
||||
#include "nix/store/store-open.hh"
|
||||
#include "nix/util/posix-source-accessor.hh"
|
||||
#include "nix/store/export-import.hh"
|
||||
|
||||
#include <sodium.h>
|
||||
#include <nlohmann/json.hpp>
|
||||
|
|
@ -233,7 +234,7 @@ StoreWrapper::exportPaths(int fd, ...)
|
|||
StorePathSet paths;
|
||||
for (int n = 2; n < items; ++n) paths.insert(THIS->store->parseStorePath(SvPV_nolen(ST(n))));
|
||||
FdSink sink(fd);
|
||||
THIS->store->exportPaths(paths, sink);
|
||||
exportPaths(*THIS->store, paths, sink);
|
||||
} catch (Error & e) {
|
||||
croak("%s", e.what());
|
||||
}
|
||||
|
|
@ -244,7 +245,7 @@ StoreWrapper::importPaths(int fd, int dontCheckSigs)
|
|||
PPCODE:
|
||||
try {
|
||||
FdSource source(fd);
|
||||
THIS->store->importPaths(source, dontCheckSigs ? NoCheckSigs : CheckSigs);
|
||||
importPaths(*THIS->store, source, dontCheckSigs ? NoCheckSigs : CheckSigs);
|
||||
} catch (Error & e) {
|
||||
croak("%s", e.what());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue