summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-07-30 18:08:28 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-07-30 18:08:28 +0200
commit869250809bddcf8eab26ecdedabad6fc060751dd (patch)
tree2108049faa07fd2b79d679799fa51ce8a2e5612a /guix
parentf419abea22fe5dd3aa96c19990316e502157350b (diff)
parentf475b90c353deff5b848753bf88c855f481f1ec0 (diff)
downloadguix-patches-869250809bddcf8eab26ecdedabad6fc060751dd.tar
guix-patches-869250809bddcf8eab26ecdedabad6fc060751dd.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'guix')
-rw-r--r--guix/ssh.scm11
1 files changed, 8 insertions, 3 deletions
diff --git a/guix/ssh.scm b/guix/ssh.scm
index 9e90216a2d..da20d4d8db 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -279,10 +279,15 @@ Return the list of store items actually sent."
(remove (cut valid-path? store <>)
',files)))))
(count (length missing))
+ (sizes (map (lambda (item)
+ (path-info-nar-size (query-path-info local item)))
+ missing))
(port (store-import-channel session)))
- (format log-port (N_ "sending ~a store item to '~a'...~%"
- "sending ~a store items to '~a'...~%" count)
- count (session-get session 'host))
+ (format log-port (N_ "sending ~a store item (~h MiB) to '~a'...~%"
+ "sending ~a store items (~h MiB) to '~a'...~%" count)
+ count
+ (inexact->exact (round (/ (reduce + 0 sizes) (expt 2. 20))))
+ (session-get session 'host))
;; Send MISSING in topological order.
(export-paths local missing port)