mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

upstream: Return #f when ‘source-urls’ is a <git-reference>.

Browse source 
Fixes a type error where ‘find2’ could be passed a <git-reference>
instead of a list of strings (URLs).

* guix/upstream.scm (preferred-upstream-source-url): Return #f and #f
when ‘upstream-source-urls’ does not return a pair.

Change-Id: If43a610fac5f3feb871e0900966d65b4971bd053
This commit is contained in:
Ludovic Courtès 2025-01-11 18:18:48 +01:00
parent 5d288cdeaf
commit ab4dc03b67
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
guix/upstream.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2010-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2010-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2019, 2022-2024 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019, 2022-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@ -435,16 +435,18 @@ (define (preferred-upstream-source-url source package)
"Return two values: a source URL that matches the archive type of "Return two values: a source URL that matches the archive type of
PACKAGE (gz, xz, bz2, etc.) and the corresponding signature URL or #f if there PACKAGE (gz, xz, bz2, etc.) and the corresponding signature URL or #f if there
is no signature. Return #f and #f when this is not applicable." is no signature. Return #f and #f when this is not applicable."
(let ((archive-type (package-archive-type package))) (if (pair? (upstream-source-urls source))
(find2 (lambda (url sig-url) (let ((archive-type (package-archive-type package)))
;; Some URIs lack a file extension, like (find2 (lambda (url sig-url)
;; 'https://crates.io/???/0.1/download'. In that case, pick the ;; Some URIs lack a file extension, like
;; first URL. ;; 'https://crates.io/???/0.1/download'. In that case, pick the
(or (not archive-type) ;; first URL.
(string-suffix? archive-type url))) (or (not archive-type)
(upstream-source-urls source) (string-suffix? archive-type url)))
(or (upstream-source-signature-urls source) (upstream-source-urls source)
(circular-list #f))))) (or (upstream-source-signature-urls source)
(circular-list #f))))
(values #f #f))) ;'source-urls' must be a <git-reference>
(define (preferred-upstream-source source package) (define (preferred-upstream-source source package)
"Return a variant of SOURCE that uses the same archive type as PACKAGE's "Return a variant of SOURCE that uses the same archive type as PACKAGE's