[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54307] [PATCH 2/2] ui: 'show-what-to-build' highlights "would be do
From: |
Ludovic Courtès |
Subject: |
[bug#54307] [PATCH 2/2] ui: 'show-what-to-build' highlights "would be downloaded" headings. |
Date: |
Wed, 9 Mar 2022 11:12:34 +0100 |
* guix/ui.scm (show-what-to-build): Highlight "X MB would be downloaded".
---
guix/ui.scm | 74 +++++++++++++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 30 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index 8e4e3e2dfc..6c194eb3c9 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -1041,21 +1041,28 @@ (define display-download-size?
(map colorized-store-item build)))
(cond ((>= verbosity 2)
(if display-download-size?
- (format (current-error-port)
- ;; TRANSLATORS: "MB" is for "megabyte"; it should
be
- ;; translated to the corresponding abbreviation.
- (G_ "~:[~,1h MB would be downloaded:~%~{
~a~%~}~;~]")
- (null? download)
- download-size
- (map (compose colorized-store-item
substitutable-path)
- download))
- (format (current-error-port)
- (N_ "~:[The following file would be
downloaded:~%~{ ~a~%~}~;~]"
- "~:[The following files would be
downloaded:~%~{ ~a~%~}~;~]"
- (length download))
- (null? download)
- (map (compose colorized-store-item
substitutable-path)
- download)))
+ (begin
+ (format (current-error-port)
+ (highlight
+ ;; TRANSLATORS: "MB" is for "megabyte"; it
+ ;; should be translated to the corresponding
+ ;; abbreviation.
+ (G_ "~:[~,1h MB would be downloaded:~%~;~]"))
+ (null? download)
+ download-size)
+ (format (current-error-port) "~{ ~a~%~}"
+ (map (compose colorized-store-item
substitutable-path)
+ download)))
+ (begin
+ (format (current-error-port)
+ (highlight
+ (N_ "~:[The following file would be
downloaded:~%~;~]"
+ "~:[The following files would be
downloaded:~%~;~]"
+ (length download)))
+ (null? download))
+ (format (current-error-port) "~{ ~a~%~}"
+ (map (compose colorized-store-item
substitutable-path)
+ download))))
(format (current-error-port)
(N_ "~:[The following graft would be made:~%~{
~a~%~}~;~]"
"~:[The following grafts would be made:~%~{
~a~%~}~;~]"
@@ -1094,21 +1101,28 @@ (define display-download-size?
(map colorized-store-item build)))
(cond ((>= verbosity 2)
(if display-download-size?
- (format (current-error-port)
- ;; TRANSLATORS: "MB" is for "megabyte"; it should
be
- ;; translated to the corresponding abbreviation.
- (G_ "~:[~,1h MB will be downloaded:~%~{
~a~%~}~;~]")
- (null? download)
- download-size
- (map (compose colorized-store-item
substitutable-path)
- download))
- (format (current-error-port)
- (N_ "~:[The following file will be
downloaded:~%~{ ~a~%~}~;~]"
- "~:[The following files will be
downloaded:~%~{ ~a~%~}~;~]"
- (length download))
- (null? download)
- (map (compose colorized-store-item
substitutable-path)
- download)))
+ (begin
+ (format (current-error-port)
+ (highlight
+ ;; TRANSLATORS: "MB" is for "megabyte"; it
+ ;; should be translated to the corresponding
+ ;; abbreviation.
+ (G_ "~:[~,1h MB will be downloaded:~%~;~]"))
+ (null? download)
+ download-size)
+ (format (current-error-port) "~{ ~a~%~}"
+ (map (compose colorized-store-item
substitutable-path)
+ download)))
+ (begin
+ (format (current-error-port)
+ (highlight
+ (N_ "~:[The following file will be
downloaded:~%~;~]"
+ "~:[The following files will be
downloaded:~%~;~]"
+ (length download)))
+ (null? download))
+ (format (current-error-port) "~{ ~a~%~}"
+ (map (compose colorized-store-item
substitutable-path)
+ download))))
(format (current-error-port)
(N_ "~:[The following graft will be made:~%~{
~a~%~}~;~]"
"~:[The following grafts will be made:~%~{
~a~%~}~;~]"
--
2.34.0
bug#54307: [PATCH 0/2] Highlight headings showing what to build/download, Ludovic Courtès, 2022/03/18