diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-04-07 22:07:25 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-07 22:28:36 +0200 |
commit | 1151f6aeae281ae391f925f5cee086f1c2a0728a (patch) | |
tree | 5784a8ffa2b6ab2960620bb70732ea55b4a0e3e5 /guix/scripts | |
parent | c8bfa5b425c1285cbd4c4a3283f09e2ebb6687f9 (diff) | |
download | gnu-guix-1151f6aeae281ae391f925f5cee086f1c2a0728a.tar gnu-guix-1151f6aeae281ae391f925f5cee086f1c2a0728a.tar.gz |
ui: Add 'report-load-error'.
* guix/scripts/system.scm (read-operating-system): Replace error
handling code by a call to 'report-load-error'.
* guix/ui.scm (report-load-error): New procedure.
Diffstat (limited to 'guix/scripts')
-rw-r--r-- | guix/scripts/system.scm | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 1b64e6fb92..1838e89452 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -69,21 +69,7 @@ (set-current-module %user-module) (primitive-load file)))) (lambda args - (match args - (('system-error . _) - (let ((err (system-error-errno args))) - (leave (_ "failed to open operating system file '~a': ~a~%") - file (strerror err)))) - (('syntax-error proc message properties form . rest) - (let ((loc (source-properties->location properties))) - (format (current-error-port) (_ "~a: error: ~a~%") - (location->string loc) message) - (exit 1))) - ((error args ...) - (report-error (_ "failed to load operating system file '~a':~%") - file) - (apply display-error #f (current-error-port) args) - (exit 1)))))) + (report-load-error file args)))) ;;; |