[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/11: gnu-maintenance: Better handle empty #:directory for 'latest-html
From: |
guix-commits |
Subject: |
01/11: gnu-maintenance: Better handle empty #:directory for 'latest-html-release'. |
Date: |
Fri, 19 Mar 2021 08:57:30 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit a0f83602f8333f2e9fa01ee8ad1ce9e073f5b753
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Mar 18 15:15:44 2021 +0100
gnu-maintenance: Better handle empty #:directory for 'latest-html-release'.
In particular, this makes sure we don't add a trailing slash when the
user specified a 'release-monitoring-url' property for the
'generic-html' updater.
* guix/gnu-maintenance.scm (latest-html-release): When DIRECTORY is
empty, do not append it.
---
guix/gnu-maintenance.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 4ba2a5f..d9c97be 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -475,7 +475,9 @@ 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* ((uri (string->uri (string-append base-url directory "/")))
+ (let* ((uri (string->uri (if (string-null? directory)
+ base-url
+ (string-append base-url directory "/"))))
(port (http-fetch/cached uri #:ttl 3600))
(sxml (html->sxml port))
(links (delete-duplicates (html-links sxml))))
- branch master updated (60d629d -> 9991b5e), guix-commits, 2021/03/19
- 01/11: gnu-maintenance: Better handle empty #:directory for 'latest-html-release'.,
guix-commits <=
- 02/11: gnu: openmpi: Add 'release-monitoring-url' property., guix-commits, 2021/03/19
- 05/11: guix package: Autoload Guile-JSON and (guix describe)., guix-commits, 2021/03/19
- 06/11: git-download: Autoload Guile-Git., guix-commits, 2021/03/19
- 07/11: download: Autoload (guix build download)., guix-commits, 2021/03/19
- 04/11: guix describe: Autoload Guile-JSON., guix-commits, 2021/03/19
- 08/11: build-system/node: Remove unnecessary imports., guix-commits, 2021/03/19
- 09/11: gnu: swi-prolog: Update to 8.3.20., guix-commits, 2021/03/19
- 10/11: gnu: vis: Update to 0.7., guix-commits, 2021/03/19
- 11/11: gnu: Add dragon-drop., guix-commits, 2021/03/19
- 03/11: gnu: openmpi: Update to 4.1.0., guix-commits, 2021/03/19