janneke pushed a commit to branch hurd-team
in repository guix.
commit a9b7cec8b469505ddf043b6e7422132590ee8359
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Sat Sep 23 10:43:50 2023 +0200
Revert "gnu-maintenance: Support URI list of mixed mirrors, HTTP URLs."
This reverts commit 2a7f031ca9d6d16fe0264023d8beca02b3ac0050.
---
guix/gnu-maintenance.scm | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 881e941fbf..5a84fcb117 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -975,24 +975,17 @@ updater."
((url-predicate http-url?) package)))
(define* (import-html-updatable-release package #:key (version #f))
- "Return the latest release of PACKAGE else #f. Do that by crawling the HTML
-page of the directory containing its source tarball. Optionally include a
-VERSION string to fetch a specific version."
-
- (define (expand-uri uri)
- (match uri
- ((and (? string?) (? (cut string-prefix? "mirror://" <>) url))
- ;; Retrieve the authoritative HTTP URL from a mirror.
- (http-url? url))
- ((? string? url)
- url)
- ((url _ ...)
- ;; This case is for when the URI is a list of possibly
- ;; mirror URLs as well as HTTP URLs.
- (expand-uri url))))
-
- (let* ((uri (string->uri
- (expand-uri (origin-uri (package-source package)))))
+ "Return the latest release of PACKAGE. Do that by crawling the HTML page of
+the directory containing its source tarball. Optionally include a VERSION
+string to fetch a specific version."
+ (let* ((uri (string->uri
+ (match (origin-uri (package-source package))
+ ((and (? string?)
+ (? (cut string-prefix? "mirror://" <>) url))
+ ;; Retrieve the authoritative HTTP URL from a mirror.
+ (http-url? url))
+ ((? string? url) url)
+ ((url _ ...) url))))
(custom (assoc-ref (package-properties package)
'release-monitoring-url))
(base (or custom
