summaryrefslogtreecommitdiff
path: root/guix/narinfo.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-12-11 23:26:06 +0100
committerLudovic Courtès <ludo@gnu.org>2021-12-12 00:27:53 +0100
commitcba0395c99005f94e4ccd6c058362af7443dab12 (patch)
tree837a60dad144c02a18fbf94f76579cad0825905d /guix/narinfo.scm
parente68466de122d94ac3fa75aae234cd5fd89482a5a (diff)
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.
Diffstat (limited to 'guix/narinfo.scm')
-rw-r--r--guix/narinfo.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/narinfo.scm b/guix/narinfo.scm
index 72e0f75fda..4fc550aa6c 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