lix-project/lix
18
47
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Revert "Re-query for the derivation outputs in the post-build-hook"

Browse source 
This reverts commit 1b1e076033.

Using `queryPartialDerivationOutputMap` assumes that the derivation
exists locally which isn't the case for remote builders.
This commit is contained in:
regnat 2020-12-09 09:44:07 +01:00
parent 82e5511594
commit 6758e65612
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build/derivation-goal.cc
View file

@ -899,10 +899,8 @@ void DerivationGoal::buildDone()
Logger::Fields{worker.store.printStorePath(drvPath)}); Logger::Fields{worker.store.printStorePath(drvPath)});
PushActivity pact(act.id); PushActivity pact(act.id);
StorePathSet outputPaths; StorePathSet outputPaths;
for (auto& [_, maybeOutPath] : for (auto i : drv->outputs) {
worker.store.queryPartialDerivationOutputMap(drvPath)) { outputPaths.insert(finalOutputs.at(i.first));
if (maybeOutPath)
outputPaths.insert(*maybeOutPath);
} }
std::map<std::string, std::string> hookEnvironment = getEnv(); std::map<std::string, std::string> hookEnvironment = getEnv();