[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65230] [PATCH v4 05/10] gnu-maintenance: Accept package object in '
From: |
Maxim Cournoyer |
Subject: |
[bug#65230] [PATCH v4 05/10] gnu-maintenance: Accept package object in 'import-html-release' procedure. |
Date: |
Tue, 22 Aug 2023 12:52:22 -0400 |
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.
---
(no changes since v1)
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 @@ (define (url->links url)
(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 @@ (define* (import-html-release base-url package
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 @@ (define* (import-savannah-release package #:key (version
#f))
(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 @@ (define* (import-kernel.org-release package #:key (version
#f))
(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 @@ (define* (import-html-updatable-release package #:key
(version #f))
"://" (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
--
2.41.0
- [bug#65230] [PATCH v3 08/10] gnu-maintenance: Add support to rewrite version in URL path., (continued)
- [bug#65230] [PATCH v3 08/10] gnu-maintenance: Add support to rewrite version in URL path., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 03/10] gnu-maintenance: Extract url->links procedure., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 02/10] gnu-maintenance: Fix docstring., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 05/10] gnu-maintenance: Accept package object in 'import-html-release' procedure., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 07/10] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 06/10] gnu-maintenance: Document nested procedures in 'import-html-release'., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 09/10] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v4 01/10] gnu-maintenance: Make base-url argument of import-html-release required., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 02/10] gnu-maintenance: Fix docstring., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 03/10] gnu-maintenance: Extract url->links procedure., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 05/10] gnu-maintenance: Accept package object in 'import-html-release' procedure.,
Maxim Cournoyer <=
- [bug#65230] [PATCH v4 10/10] gnu-maintenance: Consider Qt source tarballs as "release files"., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 04/10] gnu-maintenance: Fix indentation., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 09/10] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 08/10] gnu-maintenance: Add support to rewrite version in URL path., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 07/10] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'., Maxim Cournoyer, 2023/08/22
- [bug#65230] [PATCH v4 06/10] gnu-maintenance: Document nested procedures in 'import-html-release'., Maxim Cournoyer, 2023/08/22