futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

weather: Fix '--substitute-urls'.

Browse Source 
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>
This commit is contained in:
zimoun 2020-11-16 17:51:51 +01:00 committed by Mathieu Othacehe
parent 3a089dd70e
commit c2cc5f0a00
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
guix/scripts/weather.scm
View File

@ -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)))
(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))))))
(= 1 coverage))
urls))))))
;;; Local Variables:
;;; eval: (put 'let/time 'scheme-indent-function 1)