nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui: Gracefully report '&message' conditions. 

* guix/ui.scm (report-load-error, warn-about-load-error)
(read/eval): Add special-case for SRFI-35 &message conditions.
This commit is contained in:
Ludovic Courtès 2017-04-15 23:48:34 +02:00
parent efe7d19a9e
commit f816dba680
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
guix/ui.scm
View File

@ -260,7 +260,11 @@ ARGS is the list of arguments received by the 'throw' handler."
(format (current-error-port) (_ "~a: error: ~a~%") (format (current-error-port) (_ "~a: error: ~a~%")
(location->string loc) message))) (location->string loc) message)))
(('srfi-34 obj) (('srfi-34 obj)
(report-error (_ "exception thrown: ~s~%") obj)) (if (message-condition? obj)
(report-error (_ "~a~%")
(gettext (condition-message obj)
%gettext-domain))
(report-error (_ "exception thrown: ~s~%") obj)))
((error args ...) ((error args ...)
(report-error (_ "failed to load '~a':~%") file) (report-error (_ "failed to load '~a':~%") file)
(apply display-error frame (current-error-port) args)))) (apply display-error frame (current-error-port) args))))
@ -277,8 +281,12 @@ exiting. ARGS is the list of arguments received by the 'throw' handler."
(format (current-error-port) (_ "~a: warning: ~a~%") (format (current-error-port) (_ "~a: warning: ~a~%")
(location->string loc) message))) (location->string loc) message)))
(('srfi-34 obj) (('srfi-34 obj)
(if (message-condition? obj)
(warning (_ "failed to load '~a': ~a~%")
file
(gettext (condition-message obj) %gettext-domain))
(warning (_ "failed to load '~a': exception thrown: ~s~%") (warning (_ "failed to load '~a': exception thrown: ~s~%")
file obj)) file obj)))
((error args ...) ((error args ...)
(warning (_ "failed to load '~a':~%") file) (warning (_ "failed to load '~a':~%") file)
(apply display-error #f (current-error-port) args)))) (apply display-error #f (current-error-port) args))))
@ -539,7 +547,11 @@ similar."
(('syntax-error proc message properties form . rest) (('syntax-error proc message properties form . rest)
(report-error (_ "syntax error: ~a~%") message)) (report-error (_ "syntax error: ~a~%") message))
(('srfi-34 obj) (('srfi-34 obj)
(report-error (_ "exception thrown: ~s~%") obj)) (if (message-condition? obj)
(report-error (_ "~a~%")
(gettext (condition-message obj)
%gettext-domain))
(report-error (_ "exception thrown: ~s~%") obj)))
((error args ...) ((error args ...)
(apply display-error #f (current-error-port) args)) (apply display-error #f (current-error-port) args))
(what? #f)) (what? #f))