GNU bug report logs - #33376
fixes related to 'guix publish' being run without the '--cache' option

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 33376 in the body.
You can then email your comments to 33376 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Clément Lassieur <clement <at> lassieur.org>
To: guix-patches <at> gnu.org
Subject: fixes related to 'guix publish' being run without the '--cache' option
Date: Wed, 14 Nov 2018 11:10:51 +0100

Hi,

These two patches fix some issues I have when using 'guix publish'
without the '--cache' option.

The first fixes a crash.

The second makes sure the last display is not a 0B display, which is
annoying because it's the only one that remains on the screen.

Cheers,
Clément

Message #8 received at 33376 <at> debbugs.gnu.org (full text, mbox):

From: Clément Lassieur <clement <at> lassieur.org>
To: 33376 <at> debbugs.gnu.org
Subject: [PATCH 1/2] progress: Fix crash because of division by zero.
Date: Wed, 14 Nov 2018 11:13:11 +0100

* guix/progress.scm (display-download-progress): Handle the case where SIZE is
null.
---
 guix/progress.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/progress.scm b/guix/progress.scm
index 9da667a02..7a25f11bd 100644
--- a/guix/progress.scm
+++ b/guix/progress.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 Sou Bunnbu <iyzsong <at> gmail.com>
 ;;; Copyright © 2015 Steve Sprang <scs <at> stevesprang.com>
 ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2018 Clément Lassieur <clement <at> lassieur.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -197,7 +198,7 @@ throughput."
   (define elapsed
     (duration->seconds
      (time-difference (current-time time-monotonic) start-time)))
-  (if (number? size)
+  (if (and (number? size) (not (zero? size)))
       (let* ((%  (* 100.0 (/ transferred size)))
              (throughput (/ transferred elapsed))
              (left       (format #f " ~a  ~a" file
-- 
2.19.1

Message #11 received at 33376 <at> debbugs.gnu.org (full text, mbox):

From: Clément Lassieur <clement <at> lassieur.org>
To: 33376 <at> debbugs.gnu.org
Subject: [PATCH 2/2] progress: Do not display the last 0B transfer when size
 is unknown.
Date: Wed, 14 Nov 2018 11:13:12 +0100

* guix/progress.scm (display-download-progress): Don't display anything when
both SIZE and TRANSFERRED are null.
---
 guix/progress.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/guix/progress.scm b/guix/progress.scm
index 7a25f11bd..65080bcf2 100644
--- a/guix/progress.scm
+++ b/guix/progress.scm
@@ -212,17 +212,20 @@ throughput."
                                     (current-terminal-columns))
                  log-port)
         (force-output log-port))
-      (let* ((throughput (/ transferred elapsed))
-             (left       (format #f " ~a" file))
-             (right      (format #f "~a/s ~a | ~a transferred"
-                                 (byte-count->string throughput)
-                                 (seconds->string elapsed)
-                                 (byte-count->string transferred))))
-        (erase-current-line log-port)
-        (display (string-pad-middle left right
-                                    (current-terminal-columns))
-                 log-port)
-        (force-output log-port))))
+      ;; If we don't know the total size, the last transfer will have a 0B
+      ;; size.  Don't display it.
+      (unless (zero? transferred)
+        (let* ((throughput (/ transferred elapsed))
+               (left       (format #f " ~a" file))
+               (right      (format #f "~a/s ~a | ~a transferred"
+                                   (byte-count->string throughput)
+                                   (seconds->string elapsed)
+                                   (byte-count->string transferred))))
+          (erase-current-line log-port)
+          (display (string-pad-middle left right
+                                      (current-terminal-columns))
+                   log-port)
+          (force-output log-port)))))
 
 (define %progress-interval
   ;; Default interval between subsequent outputs for rate-limited displays.
-- 
2.19.1

Message #14 received at 33376 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Clément Lassieur <clement <at> lassieur.org>
Cc: 33376 <at> debbugs.gnu.org
Subject: Re: [bug#33376] [PATCH 2/2] progress: Do not display the last 0B
 transfer when size is unknown.
Date: Fri, 16 Nov 2018 22:43:52 +0900

Hi Clément,

This patch and the previous one LGTM.

Thanks,

Mathieu

Message #19 received at 33376-done <at> debbugs.gnu.org (full text, mbox):

From: Clément Lassieur <clement <at> lassieur.org>
To: Mathieu Othacehe <m.othacehe <at> gmail.com>
Cc: 33376-done <at> debbugs.gnu.org
Subject: Re: [bug#33376] [PATCH 2/2] progress: Do not display the last 0B
 transfer when size is unknown.
Date: Fri, 16 Nov 2018 14:55:58 +0100

Mathieu Othacehe <m.othacehe <at> gmail.com> writes:

> Hi Clément,
>
> This patch and the previous one LGTM.

Pushed, thank you for reviewing!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.