wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

Add assert for replaced storePath

Browse source
This commit is contained in:
Matthew Bauer 2020-06-17 14:04:46 -04:00
parent 7bd88cc1dc
commit 8974755d19
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -598,6 +598,8 @@ void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
if (info->isContentAddressed(*srcStore)) {
auto info2 = make_ref<ValidPathInfo>(*info);
info2->path = dstStore->makeFixedOutputPathFromCA(info->path.name(), info->ca);
if (dstStore->storeDir == srcStore->storeDir)
assert(info->path == info2->path);
info = info2;
}
@ -670,6 +672,8 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore, const StorePathSet & st
auto storePathForDst = storePath;
if (info->isContentAddressed(*srcStore)) {
storePathForDst = dstStore->makeFixedOutputPathFromCA(storePath.name(), info->ca);
if (dstStore->storeDir == srcStore->storeDir)
assert(storePathForDst == storePath);
if (storePathForDst != storePath)
debug("replaced path '%s' to '%s' for substituter '%s'", srcStore->printStorePath(storePath), dstStore->printStorePath(storePathForDst), dstStore->getUri());
}
@ -695,6 +699,8 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore, const StorePathSet & st
auto storePathForDst = storePath;
if (info->isContentAddressed(*srcStore)) {
storePathForDst = dstStore->makeFixedOutputPathFromCA(storePath.name(), info->ca);
if (dstStore->storeDir == srcStore->storeDir)
assert(storePathForDst == storePath);
if (storePathForDst != storePath)
debug("replaced path '%s' to '%s' for substituter '%s'", srcStore->printStorePath(storePath), dstStore->printStorePath(storePathForDst), dstStore->getUri());
}