[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65230] [PATCH v4 01/10] gnu-maintenance: Make base-url argument of
From: |
Maxim Cournoyer |
Subject: |
[bug#65230] [PATCH v4 01/10] gnu-maintenance: Make base-url argument of import-html-release required. |
Date: |
Tue, 22 Aug 2023 12:52:18 -0400 |
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.
---
(no changes since v1)
guix/gnu-maintenance.scm | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 5c16a7617d..198d72fc86 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -483,15 +483,14 @@ (define (html-links sxml)
(_
links))))
-(define* (import-html-release package
+(define* (import-html-release base-url package
#:key
(version #f)
- (base-url "https://kernel.org/pub")
(directory (string-append "/" package))
file->signature)
- "Return an <upstream-source> for the latest release of PACKAGE (a string) on
-SERVER under DIRECTORY, or #f. Optionally include a VERSION string to fetch a
-specific version.
+ "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.
BASE-URL should be the URL of an HTML page, typically a directory listing as
found on 'https://kernel.org/pub'.
@@ -730,9 +729,8 @@ (define* (import-savannah-release package #:key (version
#f))
(directory (dirname (uri-path uri))))
;; Note: We use the default 'file->signature', which adds ".sig", ".asc",
;; or whichever detached signature naming scheme PACKAGE uses.
- (import-html-release package
+ (import-html-release %savannah-base package
#:version version
- #:base-url %savannah-base
#:directory directory)))
(define* (latest-sourceforge-release package #:key (version #f))
@@ -824,9 +822,8 @@ (define* (import-kernel.org-release package #:key (version
#f))
((uri mirrors ...) uri))))
(package (package-upstream-name package))
(directory (dirname (uri-path uri))))
- (import-html-release package
+ (import-html-release %kernel.org-base package
#:version version
- #:base-url %kernel.org-base
#:directory directory
#:file->signature file->signature)))
@@ -874,9 +871,8 @@ (define* (import-html-updatable-release package #:key
(version #f))
(dirname (uri-path uri))))
(package (package-upstream-name package)))
(false-if-networking-error
- (import-html-release package
+ (import-html-release base package
#:version version
- #:base-url base
#:directory directory))))
(define %gnu-updater
base-commit: c655231b72ac28b5a433069fcf86a835c9c83691
--
2.41.0
- [bug#65230] [PATCH v3 01/10] gnu-maintenance: Make base-url argument of import-html-release required., (continued)
- [bug#65230] [PATCH v3 01/10] gnu-maintenance: Make base-url argument of import-html-release required., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 04/10] gnu-maintenance: Fix indentation., Maxim Cournoyer, 2023/08/21
- [bug#65230] [PATCH v3 10/10] gnu-maintenance: Consider Qt source tarballs as "release files"., Maxim Cournoyer, 2023/08/21
- [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 <=
- [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, 2023/08/22
- [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