diff options
| author | zimoun <zimon.toutoune@gmail.com> | 2020-11-16 17:51:51 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-11-25 11:55:07 +0100 |
| commit | c2cc5f0a006fd7797039dae24274833118ea7b47 (patch) | |
| tree | 40ffb1ac4f643056b499d8c27279159f16cfc631 /guix/scripts | |
| parent | 3a089dd70eb66fbaf5e1703d87e93394fc73e0b5 (diff) | |
weather: Fix '--substitute-urls'.
Fixes <https://bugs.gnu.org/44574>.
Reported by Efraim Flashner <efraim@flashner.co.il>.
* guix/scripts/weather.scm (guix-weather): Fix when substitute-urls
is a list.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/weather.scm | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 6a2582c997..f28070ddc4 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com> +;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (guix grafts) #:use-module (guix gexp) #:use-module ((guix build syscalls) #:select (terminal-columns)) + #:use-module ((guix build utils) #:select (every*)) #:use-module (guix scripts substitute) #:use-module (guix http-client) #:use-module (guix ci) @@ -540,23 +542,23 @@ SERVER. Display information for packages with at least THRESHOLD dependents." (package-outputs packages system)) systems)))))) (exit - (every (lambda (server) - (define coverage - (report-server-coverage server items - #:display-missing? - (assoc-ref opts 'display-missing?))) - (match (assoc-ref opts 'coverage) - (#f #f) - (threshold - ;; PACKAGES may include non-package objects coming from a - ;; manifest. Filter them out. - (report-package-coverage server - (filter package? packages) - systems - #:threshold threshold))) - - (= 1 coverage)) - urls)))))) + (every* (lambda (server) + (define coverage + (report-server-coverage server items + #:display-missing? + (assoc-ref opts 'display-missing?))) + (match (assoc-ref opts 'coverage) + (#f #f) + (threshold + ;; PACKAGES may include non-package objects coming from a + ;; manifest. Filter them out. + (report-package-coverage server + (filter package? packages) + systems + #:threshold threshold))) + + (= 1 coverage)) + urls)))))) ;;; Local Variables: ;;; eval: (put 'let/time 'scheme-indent-function 1) |