diff options
Diffstat (limited to 'guix/status.scm')
-rw-r--r-- | guix/status.scm | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/guix/status.scm b/guix/status.scm index fba28765df..b8905c9542 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. @@ -414,6 +414,11 @@ produce colorful output. When PRINT-LOG? is true, display the build log in addition to build events. When PRINT-URLS? is true, display the URL of substitutes being downloaded." (define info + (if (and colorize? (or print-urls? print-log?)) + (cute colorize-string <> (color BOLD)) + identity)) + + (define emph (if colorize? (cute colorize-string <> (color BOLD)) identity)) @@ -483,7 +488,9 @@ substitutes being downloaded." (format port (info (N_ "applying ~a graft for ~a ..." "applying ~a grafts for ~a ..." count)) - count drv))) + count + (string-drop-right (store-path-package-name drv) + (string-length ".drv"))))) ('profile (let ((count (match (assq-ref properties 'profile) (#f 0) @@ -496,7 +503,7 @@ substitutes being downloaded." (let ((hook-type (assq-ref properties 'hook))) (or (and=> (hook-message hook-type) (lambda (msg) - (format port (info msg)))) + (display (info msg) port))) (format port (info (G_ "running profile hook of type '~a'...")) hook-type)))) (_ @@ -524,7 +531,7 @@ substitutes being downloaded." (format port (failure (G_ "Could not find build log for '~a'.")) drv)) (log - (format port (info (G_ "View build log at '~a'.")) log))) + (format port (emph (G_ "View build log at '~a'.")) log))) (newline port)) (('substituter-started item _ ...) (erase-current-line*) @@ -575,12 +582,12 @@ substitutes being downloaded." ;; /gnu/store/…-sth:", where "sha256" is the hash algorithm. (format port (failure (G_ "~a hash mismatch for ~a:")) algo item) (newline port) - (format port (info (G_ "\ + (format port (emph (G_ "\ expected hash: ~a actual hash: ~a~%")) expected actual)) (('build-remote drv host _ ...) - (format port (info (G_ "offloading build of ~a to '~a'")) drv host) + (format port (emph (G_ "offloading build of ~a to '~a'")) drv host) (newline port)) (('build-log pid line) (if (multiplexed-output-supported?) |