summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
Diffstat (limited to 'guix')
-rw-r--r--guix/ui.scm19
1 files changed, 10 insertions, 9 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index 42afdc2856..efc3f39186 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -795,14 +795,6 @@ directories:~{ ~a~}~%")
(invoke-error-stop-signal c)
(cons (invoke-error-program c)
(invoke-error-arguments c))))
- ((message-condition? c)
- ;; Normally '&message' error conditions have an i18n'd message.
- (report-error (and (error-location? c) (error-location c))
- (G_ "~a~%")
- (gettext (condition-message c) %gettext-domain))
- (when (fix-hint? c)
- (display-hint (condition-fix-hint c)))
- (exit 1))
((formatted-message? c)
(apply report-error
@@ -825,7 +817,16 @@ directories:~{ ~a~}~%")
(guile-3
((exception-predicate &exception-with-kind-and-args) c))
(else #f))
- (raise c)))
+ (raise c))
+
+ ((message-condition? c)
+ ;; Normally '&message' error conditions have an i18n'd message.
+ (report-error (and (error-location? c) (error-location c))
+ (G_ "~a~%")
+ (gettext (condition-message c) %gettext-domain))
+ (when (fix-hint? c)
+ (display-hint (condition-fix-hint c)))
+ (exit 1)))
;; Catch EPIPE and the likes.
(catch 'system-error
thunk