nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

substitute: Make download messages more concise. 

'guix substitute' now displays 2 lines per download instead of 4.
Suggested by Ricardo Wurmus.

* guix/scripts/substitute.scm (assert-valid-narinfo): Have #:verbose?
default to #f.  Remove leading newline in message.
(process-substitution): Display the URI rather than the store file name.
Display two newlines after the substitution.
This commit is contained in:
Ludovic Courtès 2016-10-10 09:55:25 +02:00
parent 99a61dad33
commit 7c515a43b0
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/scripts/substitute.scm
View File

@ -391,7 +391,7 @@ No authentication and authorization checks are performed here!"
(define* (assert-valid-narinfo narinfo (define* (assert-valid-narinfo narinfo
#:optional (acl (current-acl)) #:optional (acl (current-acl))
#:key (verbose? #t)) #:key verbose?)
"Raise an exception if NARINFO lacks a signature, has an invalid signature, "Raise an exception if NARINFO lacks a signature, has an invalid signature,
or is signed by an unauthorized key." or is signed by an unauthorized key."
(let ((hash (narinfo-sha256 narinfo))) (let ((hash (narinfo-sha256 narinfo)))
@ -404,9 +404,8 @@ or is signed by an unauthorized key."
(unless %allow-unauthenticated-substitutes? (unless %allow-unauthenticated-substitutes?
(assert-valid-signature narinfo signature hash acl) (assert-valid-signature narinfo signature hash acl)
(when verbose? (when verbose?
;; Visually separate substitutions with a newline.
(format (current-error-port) (format (current-error-port)
(_ "~%Found valid signature for ~a~%") (_ "Found valid signature for ~a~%")
(narinfo-path narinfo)) (narinfo-path narinfo))
(format (current-error-port) (format (current-error-port)
(_ "From ~a~%") (_ "From ~a~%")
@ -893,7 +892,7 @@ DESTINATION as a nar file. Verify the substitute against ACL."
;; "(4.1MiB installed)"; it shows the size of the package once ;; "(4.1MiB installed)"; it shows the size of the package once
;; installed. ;; installed.
(_ "Downloading ~a~:[~*~; (~a installed)~]...~%") (_ "Downloading ~a~:[~*~; (~a installed)~]...~%")
(store-path-abbreviation store-item) (uri->string uri)
;; Use the Nar size as an estimate of the installed size. ;; Use the Nar size as an estimate of the installed size.
(narinfo-size narinfo) (narinfo-size narinfo)
(and=> (narinfo-size narinfo) (and=> (narinfo-size narinfo)
@ -921,8 +920,9 @@ DESTINATION as a nar file. Verify the substitute against ACL."
;; Unpack the Nar at INPUT into DESTINATION. ;; Unpack the Nar at INPUT into DESTINATION.
(restore-file input destination) (restore-file input destination)
;; Skip a line after what 'progress-proc' printed. ;; Skip a line after what 'progress-proc' printed, and another one to
(newline (current-error-port)) ;; visually separate substitutions.
(display "\n\n" (current-error-port))
(every (compose zero? cdr waitpid) pids)))) (every (compose zero? cdr waitpid) pids))))