From patchwork Wed Nov 14 10:13:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 198 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 466F11680A; Wed, 14 Nov 2018 10:14:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 04325167A5 for ; Wed, 14 Nov 2018 10:14:17 +0000 (GMT) Received: from localhost ([::1]:59272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMsBc-0004HZ-9H for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 05:14:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMsBR-0004Do-V3 for guix-patches@gnu.org; Wed, 14 Nov 2018 05:14:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMsBO-0000LM-Pw for guix-patches@gnu.org; Wed, 14 Nov 2018 05:14:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46717) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMsBO-0000KC-Ms for guix-patches@gnu.org; Wed, 14 Nov 2018 05:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gMsBO-0003Sg-Gz for guix-patches@gnu.org; Wed, 14 Nov 2018 05:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33376] [PATCH 1/2] progress: Fix crash because of division by zero. References: <87o9asezpw.fsf@lassieur.org> In-Reply-To: <87o9asezpw.fsf@lassieur.org> Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Nov 2018 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33376 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33376@debbugs.gnu.org Received: via spool by 33376-submit@debbugs.gnu.org id=B33376.154219041113233 (code B ref 33376); Wed, 14 Nov 2018 10:14:02 +0000 Received: (at 33376) by debbugs.gnu.org; 14 Nov 2018 10:13:31 +0000 Received: from localhost ([127.0.0.1]:50968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMsAt-0003RN-8A for submit@debbugs.gnu.org; Wed, 14 Nov 2018 05:13:31 -0500 Received: from mail.lassieur.org ([83.152.10.219]:39484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMsAq-0003R9-Sq for 33376@debbugs.gnu.org; Wed, 14 Nov 2018 05:13:29 -0500 Received: from newt.Parrot.biz (smtp.parrot.biz [62.23.167.188]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 4519997b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <33376@debbugs.gnu.org>; Wed, 14 Nov 2018 10:13:27 +0000 (UTC) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Wed, 14 Nov 2018 11:13:11 +0100 Message-Id: <20181114101312.23617-1-clement@lassieur.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2015 Steve Sprang ;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Clément Lassieur ;;; ;;; 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