maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a Store::addToStore() variant that accepts a NAR

Browse source 
As a side effect, this ensures that signatures are propagated when
copying paths between stores.

Also refactored import/export to make use of this.
This commit is contained in:
Eelco Dolstra 2016-05-04 13:36:54 +02:00
parent b6c768fb6a
commit 538a64e8c3
15 changed files with 235 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/nix-store/nix-store.cc
View file

@ -503,7 +503,7 @@ static void opReadLog(Strings opFlags, Strings opArgs)
}
else if (pathExists(logBz2Path)) {
std::cout << *decompress("bzip2", make_ref<std::string>(readFile(logBz2Path)));
std::cout << *decompress("bzip2", readFile(logBz2Path));
found = true;
break;
}
@ -703,9 +703,7 @@ static void opExport(Strings opFlags, Strings opArgs)
throw UsageError(format("unknown flag ‘%1%’") % i);
FdSink sink(STDOUT_FILENO);
Paths sorted = store->topoSortPaths(PathSet(opArgs.begin(), opArgs.end()));
reverse(sorted.begin(), sorted.end());
store->exportPaths(sorted, sink);
store->exportPaths(opArgs, sink);
}