From e4655b166c75a9e7d9629cc1a1463c4d580edc23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Nov 2016 19:08:20 +0100 Subject: [PATCH] copyClosure() / copyStorePath(): Expose dontCheckSigs Needed by Hydra. --- src/libstore/store-api.cc | 8 ++++---- src/libstore/store-api.hh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index f7f6c9696..37a2d45fe 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -449,19 +449,19 @@ const Store::Stats & Store::getStats() void copyStorePath(ref srcStore, ref dstStore, - const Path & storePath, bool repair) + const Path & storePath, bool repair, bool dontCheckSigs) { auto info = srcStore->queryPathInfo(storePath); StringSink sink; srcStore->narFromPath({storePath}, sink); - dstStore->addToStore(*info, sink.s, repair); + dstStore->addToStore(*info, sink.s, repair, dontCheckSigs); } void copyClosure(ref srcStore, ref dstStore, - const PathSet & storePaths, bool repair) + const PathSet & storePaths, bool repair, bool dontCheckSigs) { PathSet closure; for (auto & path : storePaths) @@ -480,7 +480,7 @@ void copyClosure(ref srcStore, ref dstStore, printMsg(lvlDebug, format("copying %1% missing paths") % missing.size()); for (auto & i : missing) - copyStorePath(srcStore, dstStore, i, repair); + copyStorePath(srcStore, dstStore, i, repair, dontCheckSigs); } diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 6762852cf..f6bbc9a84 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -577,12 +577,12 @@ void checkStoreName(const string & name); /* Copy a path from one store to another. */ void copyStorePath(ref srcStore, ref 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. */ void copyClosure(ref srcStore, ref 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