From 4110cc4f75997ff01318414e764aedd15610fab8 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 9 Aug 2023 13:35:03 -0400
Subject: gnu-maintenance: Make base-url argument of import-html-release
 required.

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.
---
 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 (file->signature file)
                        ((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
-- 
cgit v1.2.3