diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
| commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
| tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /guix/ui.scm | |
| parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
| parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
| download | guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'guix/ui.scm')
| -rw-r--r-- | guix/ui.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 8d7bc238bc..0c2c6a5e97 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -101,6 +101,7 @@ show-what-to-build show-what-to-build* show-manifest-transaction + guard* call-with-error-handling with-error-handling with-unbound-variable-handling @@ -435,6 +436,7 @@ exiting. ARGS is the list of arguments received by the 'throw' handler." (gettext (condition-message obj) %gettext-domain))) ((formatted-message? obj) (warning (G_ "failed to load '~a': ~a~%") + file (apply format #f (gettext (formatted-message-string obj) %gettext-domain) @@ -717,7 +719,7 @@ evaluating the tests and bodies of CLAUSES." (package-full-name package) (build-system-name system)))) ((gexp-input-error? c) - (let ((input (package-error-invalid-input c))) + (let ((input (gexp-error-invalid-input c))) (leave (G_ "~s: invalid G-expression input~%") (gexp-error-invalid-input c)))) ((profile-not-found-error? c) |