From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark H Weaver <mhw@netris.org>
Subject: bug#32895: file progress reporter crashes on small files
Date: Thu, 04 Oct 2018 19:28:21 -0400
Message-ID: <87ftxli962.fsf@netris.org>
References: <idj7ej121mo.fsf@bimsb-sys02.mdc-berlin.net>
	<87y3behw3n.fsf@netris.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43828)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1g8D3M-00017Z-T4
	for bug-guix@gnu.org; Thu, 04 Oct 2018 19:29:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1g8D3H-00009J-GZ
	for bug-guix@gnu.org; Thu, 04 Oct 2018 19:29:08 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:32975)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1g8D3G-00007R-ND
	for bug-guix@gnu.org; Thu, 04 Oct 2018 19:29:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1g8D3G-0002n7-Cf
	for bug-guix@gnu.org; Thu, 04 Oct 2018 19:29:02 -0400
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.32895.B32895.153869572310700@debbugs.gnu.org>
In-Reply-To: <87y3behw3n.fsf@netris.org> (Mark H. Weaver's message of "Thu, 04
	Oct 2018 05:58:20 -0400")
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix/>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
To: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Cc: 32895@debbugs.gnu.org

I've applied the following temporary workaround to my private branch, to
enable me to work on the IceCat security update.

       Mark


--8<---------------cut here---------------start------------->8---
diff --git a/guix/status.scm b/guix/status.scm
index c6956066f..8c6045a7d 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -359,10 +359,11 @@ addition to build events."
           (let ((uri (if (string-contains uri "/nar/")
                          (nar-uri-abbreviation uri)
                          (basename uri))))
-            (display-download-progress uri size
-                                       #:start-time
-                                       (download-start download)
-                                       #:transferred transferred))))))
+            (when transferred  ; FIXME XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              (display-download-progress uri size
+                                         #:start-time
+                                         (download-start download)
+                                         #:transferred transferred)))))))
     (('substituter-succeeded item _ ...)
      ;; If there are no jobs running, we already reported download completion
      ;; so there's nothing left to do.
--8<---------------cut here---------------end--------------->8---