aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/build/derivation-goal.cc
diff options
context:
space:
mode:
authorregnat <rg@regnat.ovh>2020-12-09 09:44:07 +0100
committerregnat <rg@regnat.ovh>2020-12-09 09:44:07 +0100
commit6758e65612b990805d3d7d2039cd92647730e900 (patch)
tree13ace270b92382b2177646d5153e8011c905a594 /src/libstore/build/derivation-goal.cc
parent82e5511594485498f4645dbc9e143f3e51e948e6 (diff)
Revert "Re-query for the derivation outputs in the post-build-hook"
This reverts commit 1b1e0760335832c87516b9103b670b34662d5daf. Using `queryPartialDerivationOutputMap` assumes that the derivation exists locally which isn't the case for remote builders.
Diffstat (limited to 'src/libstore/build/derivation-goal.cc')
-rw-r--r--src/libstore/build/derivation-goal.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index fdf777c27..1db85bd37 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -899,10 +899,8 @@ void DerivationGoal::buildDone()
Logger::Fields{worker.store.printStorePath(drvPath)});
PushActivity pact(act.id);
StorePathSet outputPaths;
- for (auto& [_, maybeOutPath] :
- worker.store.queryPartialDerivationOutputMap(drvPath)) {
- if (maybeOutPath)
- outputPaths.insert(*maybeOutPath);
+ for (auto i : drv->outputs) {
+ outputPaths.insert(finalOutputs.at(i.first));
}
std::map<std::string, std::string> hookEnvironment = getEnv();