From 4a8d536ffe4cac1822d9655e0871fdc1684d569b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 7 Jan 2018 22:07:53 +0100 Subject: ui: Display hints that come along with '&message' conditions. * guix/ui.scm (call-with-error-handling): Add case for message and fix-hint?. --- guix/ui.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix/ui.scm b/guix/ui.scm index 6e08a611cd..895179744b 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -623,6 +623,12 @@ (define (manifest-entry-output* entry) (location->string (error-location c)) (gettext (condition-message c) %gettext-domain)) (exit 1)) + ((and (message-condition? c) (fix-hint? c)) + (format (current-error-port) "~a: error: ~a~%" + (program-name) + (gettext (condition-message c) %gettext-domain)) + (display-hint (condition-fix-hint c)) + (exit 1)) ((message-condition? c) ;; Normally '&message' error conditions have an i18n'd message. (leave (G_ "~a~%") -- cgit v1.2.3