~ruther/guix-local: narinfo: Do not repeat slash when building nar URLs.

cba0395c99005f94e4ccd6c058362af7443dab12 — Ludovic Courtès 4 years ago e68466d

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.

patch browse .tar.gz .zip

1 files changed, 3 insertions(+), 1 deletions(-)

M guix/narinfo.scm

M guix/narinfo.scm => guix/narinfo.scm +3 -1

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