diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-04-03 23:52:19 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-04-04 00:10:00 +0200 |
| commit | 3e43166ffc11fb117c55da594e57866a75625900 (patch) | |
| tree | 9f77a65750631ca2b6e5c5a0b7b55daa71f23b73 /guix/ui.scm | |
| parent | b98d4ec0aaab744ad3452cc57f9598db58a0e352 (diff) | |
| download | gnu-guix-3e43166ffc11fb117c55da594e57866a75625900.tar gnu-guix-3e43166ffc11fb117c55da594e57866a75625900.tar.gz | |
gexp: 'lower-object' raises an exception when passed an invalid object.
* guix/gexp.scm (&gexp-error, &gexp-input-error): New error conditions.
(lower-object): Raise &gexp-input-error when 'lookup-compiler' returns #f.
* tests/gexp.scm ("lower-object & gexp-input-error?"): New test.
* guix/ui.scm (call-with-error-handling): Add case for 'gexp-input-error?'.
Diffstat (limited to 'guix/ui.scm')
| -rw-r--r-- | guix/ui.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 345bf490b2..b3c94795fe 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -26,6 +26,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (guix ui) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix store) #:use-module (guix config) @@ -448,6 +449,10 @@ interpreted." (location->string loc) (package-full-name package) (build-system-name system)))) + ((gexp-input-error? c) + (let ((input (package-error-invalid-input c))) + (leave (_ "~s: invalid G-expression input~%") + (gexp-error-invalid-input c)))) ((profile-not-found-error? c) (leave (_ "profile '~a' does not exist~%") (profile-error-profile c))) |