04/15: narinfo: Do not repeat slash when building nar URLs.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit cba0395c99005f94e4ccd6c058362af7443dab12
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Dec 11 23:26:06 2021 +0100

    narinfo: Do not repeat slash when building nar URLs.
    
    * guix/narinfo.scm (narinfo-maker): When one of URLS is relative, do not
    repeat trailing slash if it's already present in CACHE-URL.
---
 guix/narinfo.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/narinfo.scm b/guix/narinfo.scm
index 72e0f75..4fc550a 100644
--- a/guix/narinfo.scm
+++ b/guix/narinfo.scm
@@ -144,7 +144,9 @@ must contain the original contents of a narinfo file."
                    (map (lambda (url)
                           (or (string->uri url)
                               (string->uri
-                               (string-append cache-url "/" url))))
+                               (if (string-suffix? "/" cache-url)
+                                   (string-append cache-url url)
+                                   (string-append cache-url "/" url)))))
                         urls)
                    compressions
                    (match file-sizes