me
/
guix
Archived
1
0
Fork 0
Code

ssh: Fix progress bar crash when there are zero items to send. 

* guix/ssh.scm (notify-transfer-progress): Do nothing when TOTAL is
zero.
master
Ludovic Courtès 2020-09-02 23:58:34 +02:00
parent de83660dd3
commit 44c6e6f590
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
guix/ssh.scm
View File

@ -441,14 +441,15 @@ Use SIZES to determine the size of ITEM, which is about to be sent."
(progress-bar % (- (max (current-terminal-columns) 5) 5))) (progress-bar % (- (max (current-terminal-columns) 5) 5)))
(force-output port)) (force-output port))
(let ((% (* 100. (/ sent total)))) (unless (zero? total)
(match (vhash-assoc item sizes) (let ((% (* 100. (/ sent total))))
(#f (match (vhash-assoc item sizes)
(display-bar %) (#f
(values port sizes total sent)) (display-bar %)
((_ . size) (values port sizes total sent))
(display-bar %) ((_ . size)
(values port sizes total (+ sent size)))))) (display-bar %)
(values port sizes total (+ sent size)))))))
(define (notify-transfer-completion port . args) (define (notify-transfer-completion port . args)
"Notify the user that the transfer has completed." "Notify the user that the transfer has completed."