Merge "Split ignoreException to avoid suppressing CTRL-C" into main

1 files changed, 16 insertions, 1 deletions

diff --git a/src/libutil/error.hh b/src/libutil/error.hh
index 73c1ccadd..4eff2c2bc 100644
--- a/src/libutil/error.hh
+++ b/src/libutil/error.hh
@@ -204,7 +204,22 @@ public:
 /**
  * Exception handling in destructors: print an error message, then
  * ignore the exception.
+ *
+ * If you're not in a destructor, you usually want to use `ignoreExceptionExceptInterrupt()`.
+ *
+ * This function might also be used in callbacks whose caller may not handle exceptions,
+ * but ideally we propagate the exception using an exception_ptr in such cases.
+ * See e.g. `PackBuilderContext`
+ */
+void ignoreExceptionInDestructor(Verbosity lvl = lvlError);
+
+/**
+ * Not destructor-safe.
+ * Print an error message, then ignore the exception.
+ * If the exception is an `Interrupted` exception, rethrow it.
+ *
+ * This may be used in a few places where Interrupt can't happen, but that's ok.
  */
-void ignoreException(Verbosity lvl = lvlError);
+void ignoreExceptionExceptInterrupt(Verbosity lvl = lvlError);
 
 }