Browse Source

guix system: Improve error messages.

* guix/ui.scm (report-error): Export.
* guix/scripts/system.scm (read-operating-system): Report syntax errors
  using standard GNU format.  Report other errors using 'display-error'.
gn-latest-20200428
Ludovic Courtès 7 years ago
parent
commit
70e629f548
2 changed files with 9 additions and 5 deletions
  1. +8
    -5
      guix/scripts/system.scm
  2. +1
    -0
      guix/ui.scm

+ 8
- 5
guix/scripts/system.scm View File

@ -76,11 +76,14 @@
file (strerror err))))
(('syntax-error proc message properties form . rest)
(let ((loc (source-properties->location properties)))
(leave (_ "~a: ~a~%")
(location->string loc) message)))
(_
(leave (_ "failed to load operating system file '~a': ~s~%")
file args))))))
(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))))))
;;;


+ 1
- 0
guix/ui.scm View File

@ -43,6 +43,7 @@
#:export (_
N_
P_
report-error
leave
show-version-and-exit
show-bug-report-information


Loading…
Cancel
Save