diff options
author | eldritch horrors <pennae@lix.systems> | 2024-07-25 18:05:42 +0200 |
---|---|---|
committer | eldritch horrors <pennae@lix.systems> | 2024-07-30 15:37:27 +0000 |
commit | 6c0dcd12208cf46fcfb5e0037fafa8833ec62326 (patch) | |
tree | acc3f0df3462be882287fed42c06a901c739957d | |
parent | 548c973e8282bbec5b14f3860218b23564dc0381 (diff) |
libstore: simplify substitution handleEOF
both substitution goals add only this single fd to their wait set.
Change-Id: Ibf921f5bb3919106208a0871523b32c8f67fb3d3
-rw-r--r-- | src/libstore/build/drv-output-substitution-goal.cc | 2 | ||||
-rw-r--r-- | src/libstore/build/substitution-goal.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc index 4be48c41d..69598472c 100644 --- a/src/libstore/build/drv-output-substitution-goal.cc +++ b/src/libstore/build/drv-output-substitution-goal.cc @@ -164,7 +164,7 @@ void DrvOutputSubstitutionGoal::work() void DrvOutputSubstitutionGoal::handleEOF(int fd) { - if (fd == downloadState->outPipe.readSide.get()) worker.wakeUp(shared_from_this()); + worker.wakeUp(shared_from_this()); } diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index a88bdea26..df88a5629 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -296,7 +296,7 @@ void PathSubstitutionGoal::handleChildOutput(int fd, std::string_view data) void PathSubstitutionGoal::handleEOF(int fd) { - if (fd == outPipe.readSide.get()) worker.wakeUp(shared_from_this()); + worker.wakeUp(shared_from_this()); } |