diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
commit | d0c45d2d822fdf31b8a8edc73fe7be12a0676705 (patch) | |
tree | 04ae8108a67013fce99273db4582c29e7845f0a7 /guix/scripts/substitute.scm | |
parent | 0b70f7d557181febd80b16c8e3a03887df3871af (diff) | |
parent | ac1560f18c25e4312c1f32c001405c176daa1764 (diff) | |
download | guix-patches-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar guix-patches-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
(incorporated libtiff graft)
Diffstat (limited to 'guix/scripts/substitute.scm')
-rwxr-xr-x | guix/scripts/substitute.scm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 73d4f6e2eb..71f30030b6 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -39,6 +39,8 @@ . guix:open-connection-for-uri) close-connection store-path-abbreviation byte-count->string)) + #:use-module ((guix build syscalls) + #:select (set-thread-name)) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 match) @@ -872,15 +874,7 @@ DESTINATION as a nar file. Verify the substitute against ACL." (format #t "~a~%" (narinfo-hash narinfo)) (format (current-error-port) - ;; TRANSLATORS: The second part of this message looks like - ;; "(4.1MiB installed)"; it shows the size of the package once - ;; installed. - (G_ "Downloading ~a~:[~*~; (~a installed)~]...~%") - (uri->string uri) - ;; Use the Nar size as an estimate of the installed size. - (narinfo-size narinfo) - (and=> (narinfo-size narinfo) - (cute byte-count->string <>))) + (G_ "Downloading ~a...~%") (uri->string uri)) (let*-values (((raw download-size) ;; Note that Hydra currently generates Nars on the fly ;; and doesn't specify a Content-Length, so @@ -1015,6 +1009,8 @@ default value." (#f #f) (locale (false-if-exception (setlocale LC_ALL locale)))) + (set-thread-name "guix substitute") + (with-networking (with-error-handling ; for signature errors (match args |