diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-11-26 12:21:26 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-27 00:03:03 +0100 |
| commit | 7f3bbfaf8ec3b96e02e0cf74e7515ac33c002107 (patch) | |
| tree | f3daf291dca44384ad2494aaf64e7c73083edf8d | |
| parent | 7281c8fd7eed3bfbf2c7ed9879bcb89603eac225 (diff) | |
ui: Adjust SRFI-34 exception handling to Guile 2.9.5.
* guix/ui.scm (report-load-error, warn-about-load-error)
(read/eval): Match (or 'srfi-34 '%exception) instead of just 'srfi-34 to
match what Guile 2.9.5 does.
| -rw-r--r-- | guix/ui.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index eb17d274c8..12611cb2bc 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -372,7 +372,7 @@ ARGS is the list of arguments received by the 'throw' handler." (report-error loc (G_ "~a~%") message))) (('unbound-variable _ ...) (report-unbound-variable-error args #:frame frame)) - (('srfi-34 obj) + (((or 'srfi-34 '%exception) obj) (if (message-condition? obj) (report-error (and (error-location? obj) (error-location obj)) @@ -404,7 +404,7 @@ exiting. ARGS is the list of arguments received by the 'throw' handler." (warning loc (G_ "~a~%") message))) (('unbound-variable _ ...) (report-unbound-variable-error args)) - (('srfi-34 obj) + (((or 'srfi-34 '%exception) obj) (if (message-condition? obj) (warning (G_ "failed to load '~a': ~a~%") file @@ -813,7 +813,7 @@ similar." (match args (('syntax-error proc message properties form . rest) (report-error (G_ "syntax error: ~a~%") message)) - (('srfi-34 obj) + (((or 'srfi-34 '%exception) obj) (if (message-condition? obj) (report-error (G_ "~a~%") (gettext (condition-message obj) |