[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: gnu-maintenance: Accept package object in 'import-html-release' p
From: |
guix-commits |
Subject: |
05/10: gnu-maintenance: Accept package object in 'import-html-release' procedure. |
Date: |
Sat, 26 Aug 2023 16:19:10 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit c6b5eeac92d023195f5c4adae248f2e540a09d64
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Aug 9 22:53:03 2023 -0400
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.
---
guix/gnu-maintenance.scm | 17 ++++++++---------
1 file 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
- branch master updated (cfe55b220a -> 1dce887776), guix-commits, 2023/08/26
- 01/10: gnu-maintenance: Make base-url argument of import-html-release required., guix-commits, 2023/08/26
- 06/10: gnu-maintenance: Document nested procedures in 'import-html-release'., guix-commits, 2023/08/26
- 04/10: gnu-maintenance: Fix indentation., guix-commits, 2023/08/26
- 05/10: gnu-maintenance: Accept package object in 'import-html-release' procedure.,
guix-commits <=
- 07/10: gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'., guix-commits, 2023/08/26
- 02/10: gnu-maintenance: Fix docstring., guix-commits, 2023/08/26
- 03/10: gnu-maintenance: Extract url->links procedure., guix-commits, 2023/08/26
- 08/10: gnu-maintenance: Add support to rewrite version in URL path., guix-commits, 2023/08/26
- 09/10: gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater., guix-commits, 2023/08/26
- 10/10: gnu-maintenance: Consider Qt source tarballs as "release files"., guix-commits, 2023/08/26