diff options
author | rebecca “wiggles” turner <rbt@sent.as> | 2024-10-05 17:33:00 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@localhost> | 2024-10-05 17:33:00 +0000 |
commit | 86b213e6321540328fb11c3ea99c0b24becc45b0 (patch) | |
tree | d110b44daad528a73e4a75ad69f149ea6b7d51ad /src/libstore/build/derivation-goal.cc | |
parent | a3dd07535c183433a3f1f97596e9d2b41f8a33ba (diff) | |
parent | ee0c195eba7d16b796fd9883e3fe88c0d64ff0bf (diff) |
Merge "Split ignoreException to avoid suppressing CTRL-C" into main
Diffstat (limited to 'src/libstore/build/derivation-goal.cc')
-rw-r--r-- | src/libstore/build/derivation-goal.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index d90a8639d..60389fdd5 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -107,7 +107,7 @@ DerivationGoal::~DerivationGoal() noexcept(false) { /* Careful: we should never ever throw an exception from a destructor. */ - try { closeLogFile(); } catch (...) { ignoreException(); } + try { closeLogFile(); } catch (...) { ignoreExceptionInDestructor(); } } @@ -863,7 +863,7 @@ void replaceValidPath(const Path & storePath, const Path & tmpPath) // attempt to recover movePath(oldPath, storePath); } catch (...) { - ignoreException(); + ignoreExceptionExceptInterrupt(); } throw; } |