1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 17:51:15 +02:00

Crudely make addToStoreFromDump take Source not string

I just as little beyond the type as possible, so the implementation
changes this enables can be reviewed separately.
This commit is contained in:
John Ericson 2020-07-11 15:55:04 +00:00
parent 9ec10046e0
commit c86fc3a965
5 changed files with 11 additions and 5 deletions

View file

@ -410,8 +410,11 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
logger->startWork();
if (!savedRegular.regular) throw Error("regular file expected");
StringSource dumpSource {
method == FileIngestionMethod::Recursive ? *savedNAR.s : savedRegular.s
};
auto path = store->addToStoreFromDump(
method == FileIngestionMethod::Recursive ? *savedNAR.s : savedRegular.s,
dumpSource,
baseName,
method,
hashAlgo);