aboutsummaryrefslogtreecommitdiff
path: root/src/nix/flake.cc
diff options
context:
space:
mode:
authorrebecca “wiggles” turner <rbt@sent.as>2024-10-05 17:33:00 +0000
committerGerrit Code Review <gerrit@localhost>2024-10-05 17:33:00 +0000
commit86b213e6321540328fb11c3ea99c0b24becc45b0 (patch)
treed110b44daad528a73e4a75ad69f149ea6b7d51ad /src/nix/flake.cc
parenta3dd07535c183433a3f1f97596e9d2b41f8a33ba (diff)
parentee0c195eba7d16b796fd9883e3fe88c0d64ff0bf (diff)
Merge "Split ignoreException to avoid suppressing CTRL-C" into main
Diffstat (limited to 'src/nix/flake.cc')
-rw-r--r--src/nix/flake.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 15c393c90..0c704a995 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -16,6 +16,7 @@
#include "eval-cache.hh"
#include "markdown.hh"
#include "terminal.hh"
+#include "signals.hh"
#include <limits>
#include <nlohmann/json.hpp>
@@ -367,9 +368,11 @@ struct CmdFlakeCheck : FlakeCommand
auto reportError = [&](const Error & e) {
try {
throw e;
+ } catch (Interrupted & e) {
+ throw;
} catch (Error & e) {
if (settings.keepGoing) {
- ignoreException();
+ ignoreExceptionExceptInterrupt();
hasErrors = true;
}
else