summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-08-09 22:53:03 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-08-26 11:38:56 -0400
commitc6b5eeac92d023195f5c4adae248f2e540a09d64 (patch)
tree2b991203ecf997736e89f018018e056d50146ba3 /guix
parenta5e67dec2a73ce0d8886a90fc703f7eaa2bc0fa3 (diff)
gnu-maintenance: Accept package object in 'import-html-release' procedure.
This is in preparation for a new URL rewriting feature, which will need to have the current version information available. * guix/gnu-maintenance.scm (import-html-release): Update doc. Adjust default value of the DIRECTORY argument. Bind PACKAGE in lexical scope so that its value there is unchanged. (import-savannah-release, import-kernel.org-release) (import-html-updatable-release): Adjust accordingly.
Diffstat (limited to 'guix')
-rw-r--r--guix/gnu-maintenance.scm17
1 files changed, 8 insertions, 9 deletions
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 30792db60f..eea75095b5 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -494,11 +494,12 @@ hosted on ftp.gnu.org, or not under that name (this is the case for
(define* (import-html-release base-url package
#:key
(version #f)
- (directory (string-append "/" package))
+ (directory (string-append
+ "/" (package-upstream-name package)))
file->signature)
- "Return an <upstream-source> for the latest release of PACKAGE (a string)
-under DIRECTORY at BASE-URL, or #f. Optionally include a VERSION string to
-fetch a specific version.
+ "Return an <upstream-source> for the latest release of PACKAGE under
+DIRECTORY at BASE-URL, or #f. Optionally include a VERSION string to fetch a
+specific version.
BASE-URL should be the URL of an HTML page, typically a directory listing as
found on 'https://kernel.org/pub'.
@@ -507,7 +508,8 @@ When FILE->SIGNATURE is omitted or #f, guess the detached signature file name,
if any. Otherwise, FILE->SIGNATURE must be a procedure; it is passed a source
file URL and must return the corresponding signature URL, or #f it signatures
are unavailable."
- (let* ((url (if (string-null? directory)
+ (let* ((package (package-upstream-name package))
+ (url (if (string-null? directory)
base-url
(string-append base-url directory "/")))
(links (url->links url)))
@@ -730,7 +732,6 @@ to fetch a specific version."
(match (origin-uri (package-source package))
((? string? uri) uri)
((uri mirrors ...) uri))))
- (package (package-upstream-name package))
(directory (dirname (uri-path uri))))
;; Note: We use the default 'file->signature', which adds ".sig", ".asc",
;; or whichever detached signature naming scheme PACKAGE uses.
@@ -825,7 +826,6 @@ Optionally include a VERSION string to fetch a specific version."
(match (origin-uri (package-source package))
((? string? uri) uri)
((uri mirrors ...) uri))))
- (package (package-upstream-name package))
(directory (dirname (uri-path uri))))
(import-html-release %kernel.org-base package
#:version version
@@ -873,8 +873,7 @@ string to fetch a specific version."
"://" (uri-host uri))))
(directory (if custom
""
- (dirname (uri-path uri))))
- (package (package-upstream-name package)))
+ (dirname (uri-path uri)))))
(false-if-networking-error
(import-html-release base package
#:version version