diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-11-08 11:16:25 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-11-08 22:31:58 +0100 |
| commit | 23735137eb666e9fe2e848563615bca5bcea1282 (patch) | |
| tree | 5ce26b3954ef5401c1096bbce76fc2d65e3420cd | |
| parent | 37eed374d92e0fbb29701b072c3a39433fbba16d (diff) | |
| download | guix-23735137eb666e9fe2e848563615bca5bcea1282.tar.gz guix-23735137eb666e9fe2e848563615bca5bcea1282.zip | |
ui: Define and honor '&error-location' and '&fix-hint' conditions.
* guix/utils.scm (&error-location, &fix-hint): New condition types.
* guix/ui.scm (report-load-error): Handle them.
(call-with-error-handling): Honor '&error-location'.
| -rw-r--r-- | guix/ui.scm | 23 | ||||
| -rw-r--r-- | guix/utils.scm | 17 |
2 files changed, 36 insertions, 4 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 40371e4710..a1152605e6 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -251,10 +251,20 @@ ARGS is the list of arguments received by the 'throw' handler." (location->string loc) message))) (('srfi-34 obj) (if (message-condition? obj) - (report-error (G_ "~a~%") - (gettext (condition-message obj) - %gettext-domain)) - (report-error (G_ "exception thrown: ~s~%") obj))) + (if (error-location? obj) + (format (current-error-port) + (G_ "~a: error: ~a~%") + (location->string (error-location obj)) + (gettext (condition-message obj) + %gettext-domain)) + (report-error (G_ "~a~%") + (gettext (condition-message obj) + %gettext-domain))) + (report-error (G_ "exception thrown: ~s~%") obj)) + (when (fix-hint? obj) + (format (current-error-port) (G_ "hint: ~a~%") + (fill-paragraph (texi->plain-text (condition-fix-hint obj)) + (terminal-columns) 8)))) ((error args ...) (report-error (G_ "failed to load '~a':~%") file) (apply display-error frame (current-error-port) args)))) @@ -517,6 +527,11 @@ interpreted." directories:~{ ~a~}~%") (file-search-error-file-name c) (file-search-error-search-path c))) + ((and (error-location? c) (message-condition? c)) + (format (current-error-port) + (G_ "~a: error: ~a~%") + (location->string (error-location c)) + (gettext (condition-message c) %gettext-domain))) ((message-condition? c) ;; Normally '&message' error conditions have an i18n'd message. (leave (G_ "~a~%") diff --git a/guix/utils.scm b/guix/utils.scm index eb1ec29b32..c0ffed172a 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -28,6 +28,7 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-35) #:use-module (srfi srfi-39) #:use-module (ice-9 binary-ports) #:autoload (rnrs io ports) (make-custom-binary-input-port) @@ -60,6 +61,14 @@ source-properties->location location->source-properties + &error-location + error-location? + error-location + + &fix-hint + fix-hint? + condition-fix-hint + nix-system->gnu-triplet gnu-triplet->nix-system %current-system @@ -750,6 +759,14 @@ a location object." (column . ,(location-column loc)) (filename . ,(location-file loc)))) +(define-condition-type &error-location &error + error-location? + (location error-location)) ;<location> + +(define-condition-type &fix-hint &condition + fix-hint? + (hint condition-fix-hint)) ;string + ;;; Local Variables: ;;; eval: (put 'call-with-progress-reporter 'scheme-indent-function 1) ;;; End: |