ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

ignoreException has been split into two

Browse source 
The Finally part is a destructor, so using `ignoreExceptionInDestructor`
seems to be the correct choice here.

(cherry picked from commit 995e1922d7)
This commit is contained in:
Maximilian Bosch 2024-10-07 18:06:43 +02:00
parent 6c4d56d87f
commit 523c50eac9
Signed by: ma27
SSH key fingerprint: SHA256:d7dmwHmpai66L6KIXA+wxzVbkPq0nGLrcHK3ZNroqZY
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/hydra-queue-runner/builder.cc
View file

@ -1,5 +1,6 @@
#include <cmath> #include <cmath>
#include "error.hh"
#include "state.hh" #include "state.hh"
#include "hydra-build-result.hh" #include "hydra-build-result.hh"
#include "finally.hh" #include "finally.hh"
@ -185,7 +186,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
unlink(result.logFile.c_str()); unlink(result.logFile.c_str());
} }
} catch (...) { } catch (...) {
ignoreException(); ignoreExceptionInDestructor();
} }
} }
}); });