01/11: gnu-maintenance: Better handle empty #:directory for 'latest-html-release'.

[guix-commits]

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))))