[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/17: ui: 'show-what-to-build' highlights "would be downloaded" heading
From: |
guix-commits |
Subject: |
04/17: ui: 'show-what-to-build' highlights "would be downloaded" headings. |
Date: |
Fri, 18 Mar 2022 11:05:28 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 625fa3cfe8c57cd5624608d2478c8c6be4c69c3b
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Mar 9 10:47:52 2022 +0100
ui: 'show-what-to-build' highlights "would be downloaded" headings.
* 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 @@ summary, and level 0 shows nothing."
(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 @@ summary, and level 0 shows nothing."
(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~%~}~;~]"
- branch master updated (3e34b01b70 -> 2fb4304ee7), guix-commits, 2022/03/18
- 01/17: gnu: petsc-openmpi: Fix compilation with Scotch 7.0., guix-commits, 2022/03/18
- 11/17: gnu: emacs-osm: Record the absolute file name of 'curl'., guix-commits, 2022/03/18
- 09/17: gnu: Add emacs-osm., guix-commits, 2022/03/18
- 04/17: ui: 'show-what-to-build' highlights "would be downloaded" headings.,
guix-commits <=
- 06/17: home: services: Export record type accessors., guix-commits, 2022/03/18
- 05/17: graph: Factorize 'lookup-backend'., guix-commits, 2022/03/18
- 10/17: gnu: emacs-osm: Fetch source over Git., guix-commits, 2022/03/18
- 08/17: guix system: Call 'export-graph' with the right port argument., guix-commits, 2022/03/18
- 07/17: guix home: Implement the 'extension-graph' and 'shepherd-graph' actions., guix-commits, 2022/03/18
- 12/17: home: services: Fix bash aliases without guix-defaults., guix-commits, 2022/03/18
- 14/17: gnu: feh, newsboat: Inline top-level reference to 'curl'., guix-commits, 2022/03/18
- 02/17: gnu: petsc-openmpi: Remove input labels., guix-commits, 2022/03/18
- 03/17: ui: 'show-what-to-build' highlights "The following [...] will be built"., guix-commits, 2022/03/18
- 15/17: gnu: Add ckb-next., guix-commits, 2022/03/18