diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-10 22:08:09 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-10 22:18:29 -0400 |
| commit | 3bc90825239bc1db6ea3e7dc88e3f8d4e6b2bdaf (patch) | |
| tree | 578012f7c3a051eca99a6b87369f7af22ef965f1 /guix/status.scm | |
| parent | ae5d3525348de562b84fc9faccf09fd6e06ab3df (diff) | |
| download | guix-3bc90825239bc1db6ea3e7dc88e3f8d4e6b2bdaf.tar guix-3bc90825239bc1db6ea3e7dc88e3f8d4e6b2bdaf.tar.gz | |
status: Guard against a numerical overflow condition.
Fixes <https://issues.guix.gnu.org/62766>.
* guix/status.scm (update-build): Use 0 as progress when an exception occurs
while computing it.
Diffstat (limited to 'guix/status.scm')
| -rw-r--r-- | guix/status.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/guix/status.scm b/guix/status.scm index d4d3fca026..fd89ba9dd3 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,9 +191,17 @@ a completion indication." ((regexp-exec %fraction-line-rx line) => (lambda (match) - (let ((done (string->number (match:substring match 1))) - (total (string->number (match:substring match 3)))) - (update (* 100. (/ done total)))))) + (let* ((done (string->number (match:substring match 1))) + (total (string->number (match:substring match 3))) + ;; It's possible that both done and total are 0 (see: + ;; https://issues.guix.gnu.org/62766). Special case this + ;; pathological case as a null progress (0). + (progress (catch 'numerical-overflow + (lambda () + (/ done total)) + (lambda _ + 0)))) + (update (* 100. progress))))) ((regexp-exec %phase-start-rx line) => (lambda (match) |