aboutsummaryrefslogtreecommitdiff
path: root/guix/ui.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-04-06 12:00:29 +0200
committerLudovic Courtès <ludo@gnu.org>2016-04-06 12:00:29 +0200
commit933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch)
treef10581ed0da1911eed9b02e69d999ba481d9d3c6 /guix/ui.scm
parentf8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff)
parent998afc3608242b75051f43ece36d52474c51e285 (diff)
downloadgnu-guix-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar
gnu-guix-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/ui.scm')
-rw-r--r--guix/ui.scm8
1 files changed, 8 insertions, 0 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index 7b7bee0ac8..f95c63a81b 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -461,6 +461,11 @@ interpreted."
(leave (_ "reference to invalid output '~a' of derivation '~a'~%")
(derivation-missing-output c)
(derivation-file-name (derivation-error-derivation c))))
+ ((file-search-error? c)
+ (leave (_ "file '~a' could not be found in these \
+directories:~{ ~a~}~%")
+ (file-search-error-file-name c)
+ (file-search-error-search-path c)))
((message-condition? c)
;; Normally '&message' error conditions have an i18n'd message.
(leave (_ "~a~%")
@@ -1043,6 +1048,9 @@ DURATION-RELATION with the current time."
"~b ~d ~Y ~T")))
(current (generation-number profile)))
(if (= number current)
+ ;; TRANSLATORS: The word "current" here is an adjective for
+ ;; "Generation", as in "current generation". Use the appropriate
+ ;; gender where applicable.
(format #t (_ "~a\t(current)~%") header)
(format #t "~a~%" header)))))