From 523c50eac9760cf2112431d672b4898d3c30e3ad Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 7 Oct 2024 18:06:43 +0200 Subject: [PATCH] `ignoreException` has been split into two The Finally part is a destructor, so using `ignoreExceptionInDestructor` seems to be the correct choice here. (cherry picked from commit 995e1922d726d50bf87be602043bf14caa9f2d24) --- src/hydra-queue-runner/builder.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc index 3f340c72..15bf8f10 100644 --- a/src/hydra-queue-runner/builder.cc +++ b/src/hydra-queue-runner/builder.cc @@ -1,5 +1,6 @@ #include +#include "error.hh" #include "state.hh" #include "hydra-build-result.hh" #include "finally.hh" @@ -185,7 +186,7 @@ State::StepResult State::doBuildStep(nix::ref destStore, unlink(result.logFile.c_str()); } } catch (...) { - ignoreException(); + ignoreExceptionInDestructor(); } } });