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/local-store.cc | |
parent | a3dd07535c183433a3f1f97596e9d2b41f8a33ba (diff) | |
parent | ee0c195eba7d16b796fd9883e3fe88c0d64ff0bf (diff) |
Merge "Split ignoreException to avoid suppressing CTRL-C" into main
Diffstat (limited to 'src/libstore/local-store.cc')
-rw-r--r-- | src/libstore/local-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 1af0f54de..c3248c2c3 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -481,7 +481,7 @@ LocalStore::~LocalStore() unlink(fnTempRoots.c_str()); } } catch (...) { - ignoreException(); + ignoreExceptionInDestructor(); } } @@ -1222,7 +1222,7 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source, try { parseDump(sink, source); } catch (...) { - ignoreException(); + ignoreExceptionExceptInterrupt(); } } }; |