gnu-maintenance: 'generic-html' computes the right source URL.
Fixes a regression introduced in
84f8bae0f8
, whereby the URL computed for
the new ffmpeg (for instance) would be:
https://ffmpeg.org/ffmpeg-4.4.tar.xz
instead of:
https://ffmpeg.org/releases/ffmpeg-4.4.tar.xz
Reported by Maxim Cournoyer.
* guix/gnu-maintenance.scm (latest-html-release)[url->release]: Adjust
computation in the case of a URI-reference with a relative path.
master
parent
fe509e017f
commit
1e8ebb16c9
|
@ -507,12 +507,19 @@ are unavailable."
|
||||||
#:port (uri-port uri)
|
#:port (uri-port uri)
|
||||||
#:path url))))
|
#:path url))))
|
||||||
|
|
||||||
;; URL is relative path and BASE-URL may or may not
|
;; URL is a relative path and BASE-URL may or may not
|
||||||
;; end in slash.
|
;; end in slash.
|
||||||
((string-suffix? "/" base-url)
|
((string-suffix? "/" base-url)
|
||||||
(string-append base-url url))
|
(string-append base-url url))
|
||||||
(else
|
(else
|
||||||
(string-append (dirname base-url) "/" url)))))
|
;; If DIRECTORY is non-empty, assume BASE-URL
|
||||||
|
;; denotes a directory; otherwise, assume BASE-URL
|
||||||
|
;; denotes a file within a directory, and that URL
|
||||||
|
;; is relative to that directory.
|
||||||
|
(string-append (if (string-null? directory)
|
||||||
|
(dirname base-url)
|
||||||
|
base-url)
|
||||||
|
"/" url)))))
|
||||||
(and (release-file? package base)
|
(and (release-file? package base)
|
||||||
(let ((version (tarball->version base)))
|
(let ((version (tarball->version base)))
|
||||||
(upstream-source
|
(upstream-source
|
||||||
|
|
Reference in New Issue