From 1d24cc6de674ff8cd6321eb373ab86c8028e2281 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 6 Mar 2020 08:29:09 +0100 Subject: [PATCH] scripts: Show disk-space warning when under the min of the thresholds. Follow-up to 71c3c3df92375ca9b4bd28b2be90dda67288fa5c which got the logic wrong. * guix/scripts.scm (warn-about-disk-space): Compare AVAILABLE to the min of RELATIVE-THRESHOLD-IN-BYTES and ABSOLUTE-THRESHOLD-IN-BYTES, not the max. --- guix/scripts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts.scm b/guix/scripts.scm index e235c8d4c3..3e19e38957 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -237,7 +237,7 @@ (define GiB (expt 2 30)) (total (* block-size (file-system-block-count stats))) (relative-threshold-in-bytes (* total (cadr thresholds))) (absolute-threshold-in-bytes (car thresholds))) - (when (< available (max relative-threshold-in-bytes + (when (< available (min relative-threshold-in-bytes absolute-threshold-in-bytes)) (warning (G_ "only ~,1f GiB of free space available on ~a~%") (/ available 1. GiB) (%store-prefix))