me/guix
Archived
1
0
Fork 0
Code Activity

gnu-maintenance: Make base-url argument of import-html-release required.

Browse source 
It doesn't make sense to have it default to something like
"https://kernel.org/pub"; it should always be provided explicitly.

* guix/gnu-maintenance.scm (import-html-release) <#:base-url>: Turn keyword
argument into a positional argument.  Update doc.
* guix/gnu-maintenance.scm (import-savannah-release): Adjust call accordingly.
(import-kernel.org-release): Likewise.
(import-html-updatable-release): Likewise.
This commit is contained in:
Maxim Cournoyer 2023-08-09 13:35:03 -04:00
parent cfe55b220a
commit 4110cc4f75
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
guix/gnu-maintenance.scm
View file

@ -483,15 +483,14 @@ hosted on ftp.gnu.org, or not under that name (this is the case for
(_ (_
links)))) links))))
(define* (import-html-release package (define* (import-html-release base-url package
#:key #:key
(version #f) (version #f)
(base-url "https://kernel.org/pub")
(directory (string-append "/" package)) (directory (string-append "/" package))
file->signature) file->signature)
"Return an <upstream-source> for the latest release of PACKAGE (a string) on "Return an <upstream-source> for the latest release of PACKAGE (a string)
SERVER under DIRECTORY, or #f. Optionally include a VERSION string to fetch a under DIRECTORY at BASE-URL, or #f. Optionally include a VERSION string to
specific version. fetch a specific version.
BASE-URL should be the URL of an HTML page, typically a directory listing as BASE-URL should be the URL of an HTML page, typically a directory listing as
found on 'https://kernel.org/pub'. found on 'https://kernel.org/pub'.
@ -730,9 +729,8 @@ to fetch a specific version."
(directory (dirname (uri-path uri)))) (directory (dirname (uri-path uri))))
;; Note: We use the default 'file->signature', which adds ".sig", ".asc", ;; Note: We use the default 'file->signature', which adds ".sig", ".asc",
;; or whichever detached signature naming scheme PACKAGE uses. ;; or whichever detached signature naming scheme PACKAGE uses.
(import-html-release package (import-html-release %savannah-base package
#:version version #:version version
#:base-url %savannah-base
#:directory directory))) #:directory directory)))
(define* (latest-sourceforge-release package #:key (version #f)) (define* (latest-sourceforge-release package #:key (version #f))
@ -824,9 +822,8 @@ Optionally include a VERSION string to fetch a specific version."
((uri mirrors ...) uri)))) ((uri mirrors ...) uri))))
(package (package-upstream-name package)) (package (package-upstream-name package))
(directory (dirname (uri-path uri)))) (directory (dirname (uri-path uri))))
(import-html-release package (import-html-release %kernel.org-base package
#:version version #:version version
#:base-url %kernel.org-base
#:directory directory #:directory directory
#:file->signature file->signature))) #:file->signature file->signature)))
@ -874,9 +871,8 @@ string to fetch a specific version."
(dirname (uri-path uri)))) (dirname (uri-path uri))))
(package (package-upstream-name package))) (package (package-upstream-name package)))
(false-if-networking-error (false-if-networking-error
(import-html-release package (import-html-release base package
#:version version #:version version
#:base-url base
#:directory directory)))) #:directory directory))))
(define %gnu-updater (define %gnu-updater