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

Fix storeDir != storeDir condition

Browse source 
this needs to only continue if the path replacement fails.
This commit is contained in:
Matthew Bauer 2020-06-12 10:14:03 -05:00
parent 3e3eaa90dd
commit 11c97070f3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -866,12 +866,12 @@ void LocalStore::querySubstitutablePathInfos(const StorePathSet & paths,
auto info = sub->queryPathInfo(path); auto info = sub->queryPathInfo(path);
auto ca = pathsCA.find(printStorePath(path)); auto ca = pathsCA.find(printStorePath(path));
if (sub->storeDir != storeDir && info->references.empty() && ca != pathsCA.end()) { if (info->references.empty() && ca != pathsCA.end()) {
if (!hasPrefix(ca->second, "fixed:")) if (!hasPrefix(ca->second, "fixed:"))
continue; continue;
// recompute store path so that we can use a fixed output ca // recompute store path so that we can use a different store path
path = sub->makeStorePath("output:out", hashString(htSHA256, ca->second), path.name()); path = sub->makeStorePath("output:out", hashString(htSHA256, ca->second), path.name());
} else continue; } else if (sub->storeDir != storeDir) continue;
auto narInfo = std::dynamic_pointer_cast<const NarInfo>( auto narInfo = std::dynamic_pointer_cast<const NarInfo>(
std::shared_ptr<const ValidPathInfo>(info)); std::shared_ptr<const ValidPathInfo>(info));