philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

copyClosure() / copyStorePath(): Expose dontCheckSigs

Browse source 
Needed by Hydra.
This commit is contained in:
Eelco Dolstra 2016-11-09 19:08:20 +01:00
parent 4b8f1b0ec0
commit e4655b166c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/store-api.cc
View file

@ -449,19 +449,19 @@ const Store::Stats & Store::getStats()
void copyStorePath(ref<Store> srcStore, ref<Store> dstStore, void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
const Path & storePath, bool repair) const Path & storePath, bool repair, bool dontCheckSigs)
{ {
auto info = srcStore->queryPathInfo(storePath); auto info = srcStore->queryPathInfo(storePath);
StringSink sink; StringSink sink;
srcStore->narFromPath({storePath}, sink); srcStore->narFromPath({storePath}, sink);
dstStore->addToStore(*info, sink.s, repair); dstStore->addToStore(*info, sink.s, repair, dontCheckSigs);
} }
void copyClosure(ref<Store> srcStore, ref<Store> dstStore, void copyClosure(ref<Store> srcStore, ref<Store> dstStore,
const PathSet & storePaths, bool repair) const PathSet & storePaths, bool repair, bool dontCheckSigs)
{ {
PathSet closure; PathSet closure;
for (auto & path : storePaths) for (auto & path : storePaths)
@ -480,7 +480,7 @@ void copyClosure(ref<Store> srcStore, ref<Store> dstStore,
printMsg(lvlDebug, format("copying %1% missing paths") % missing.size()); printMsg(lvlDebug, format("copying %1% missing paths") % missing.size());
for (auto & i : missing) for (auto & i : missing)
copyStorePath(srcStore, dstStore, i, repair); copyStorePath(srcStore, dstStore, i, repair, dontCheckSigs);
} }

4
src/libstore/store-api.hh
View file

@ -577,12 +577,12 @@ void checkStoreName(const string & name);
/* Copy a path from one store to another. */ /* Copy a path from one store to another. */
void copyStorePath(ref<Store> srcStore, ref<Store> dstStore, void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
const Path & storePath, bool repair = false); const Path & storePath, bool repair = false, bool dontCheckSigs = false);
/* Copy the closure of the specified paths from one store to another. */ /* Copy the closure of the specified paths from one store to another. */
void copyClosure(ref<Store> srcStore, ref<Store> dstStore, void copyClosure(ref<Store> srcStore, ref<Store> dstStore,
const PathSet & storePaths, bool repair = false); const PathSet & storePaths, bool repair = false, bool dontCheckSigs = false);
/* Remove the temporary roots file for this process. Any temporary /* Remove the temporary roots file for this process. Any temporary