From 145aa2f118c4403455854c951dfe83f92b96d538 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 12 Mar 2025 18:08:10 -0400 Subject: [PATCH] Remove dead hook code in `LocalDerivationGoal::tryLocalBuild` The `assert` above proves that `hook` is not set. --- .../unix/build/local-derivation-goal.cc | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc index 18f6518e3..f17b0bced 100644 --- a/src/libstore/unix/build/local-derivation-goal.cc +++ b/src/libstore/unix/build/local-derivation-goal.cc @@ -374,23 +374,12 @@ Goal::Co LocalDerivationGoal::tryLocalBuild() BuildResult::Status st = BuildResult::MiscFailure; -#ifndef _WIN32 // TODO abstract over proc exit status - if (hook && WIFEXITED(status) && WEXITSTATUS(status) == 101) - st = BuildResult::TimedOut; - - else if (hook && (!WIFEXITED(status) || WEXITSTATUS(status) != 100)) { - } - - else -#endif - { - assert(derivationType); - st = - dynamic_cast(&e) ? BuildResult::NotDeterministic : - statusOk(status) ? BuildResult::OutputRejected : - !derivationType->isSandboxed() || diskFull ? BuildResult::TransientFailure : - BuildResult::PermanentFailure; - } + assert(derivationType); + st = + dynamic_cast(&e) ? BuildResult::NotDeterministic : + statusOk(status) ? BuildResult::OutputRejected : + !derivationType->isSandboxed() || diskFull ? BuildResult::TransientFailure : + BuildResult::PermanentFailure; co_return done(st, {}, std::move(e)); }