lix-project/lix
20
58
Fork 31
Code Issues 354 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Don’t use makeStorePath

Browse source
This commit is contained in:
Matthew Bauer 2020-06-12 14:53:30 -05:00
parent 1c148a80fe
commit 85d01e1f65
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -583,7 +583,9 @@ void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
// recompute store path on the chance dstStore does it differently // recompute store path on the chance dstStore does it differently
if (hasPrefix(info->ca, "fixed:") && info->references.empty()) { if (hasPrefix(info->ca, "fixed:") && info->references.empty()) {
auto info2 = make_ref<ValidPathInfo>(*info); auto info2 = make_ref<ValidPathInfo>(*info);
info2->path = dstStore->makeStorePath("output:out", hashString(htSHA256, info->ca), storePath.name()); FileIngestionMethod ingestionMethod { info->ca.compare(6, 2, "r:") == 0 };
Hash hash(std::string(info->ca, ingestionMethod == FileIngestionMethod::Recursive ? 8 : 6));
info2->path = dstStore->makeFixedOutputPath(ingestionMethod, hash, storePath.name());
info = info2; info = info2;
} }