ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu-maintenance: 'latest-html-release' considers non-relative URLs.

Browse source 
* guix/gnu-maintenance.scm (latest-html-release): Allow for URL to be an
arbitrary URL rather than a relative URL reference.
This commit is contained in:
Ludovic Courtès 2021-03-13 12:45:13 +01:00
parent 71f6acd28d
commit db69ebb9de
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
guix/gnu-maintenance.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
@ -479,19 +479,21 @@ (define* (latest-html-release package
(port (http-fetch/cached uri #:ttl 3600))
(sxml (html->sxml port)))
(define (url->release url)
(and (string=? url (basename url)) ;relative reference?
(release-file? package url)
(let-values (((name version)
(package-name->name+version
(tarball-sans-extension url)
#\-)))
(upstream-source
(package name)
(version version)
(urls (list (string-append base-url directory "/" url)))
(signature-urls
(list (file->signature
(string-append base-url directory "/" url))))))))
(let* ((base (basename url))
(url (if (string=? base url)
(string-append base-url directory "/" url)
url)))
(and (release-file? package base)
(let-values (((name version)
(package-name->name+version
(tarball-sans-extension base)
#\-)))
(upstream-source
(package name)
(version version)
(urls (list url))
(signature-urls
(list (file->signature url))))))))
(define candidates
(filter-map url->release (html-links sxml)))