[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/15: narinfo: Do not repeat slash when building nar URLs.
From: |
guix-commits |
Subject: |
04/15: narinfo: Do not repeat slash when building nar URLs. |
Date: |
Sat, 11 Dec 2021 18:29:28 -0500 (EST) |
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
- branch master updated (d5cfca2 -> 8bb6c74), guix-commits, 2021/12/11
- 01/15: challenge: Use SRFI-71 instead of SRFI-11., guix-commits, 2021/12/11
- 02/15: challenge: Store item contents are returned in canonical order., guix-commits, 2021/12/11
- 03/15: substitutes: Build correct narinfo URLs for cache URLs without trailing slash., guix-commits, 2021/12/11
- 05/15: gnu: Add ascii., guix-commits, 2021/12/11
- 07/15: gnu: python-vcrpy: Update to 4.1.1., guix-commits, 2021/12/11
- 04/15: narinfo: Do not repeat slash when building nar URLs.,
guix-commits <=
- 08/15: gnu: python-aws-sam-translator: Update to 1.40.0., guix-commits, 2021/12/11
- 06/15: gnu: Add python-ipaddress., guix-commits, 2021/12/11
- 09/15: gnu: python-cfn-lint: Update to 0.54.3., guix-commits, 2021/12/11
- 10/15: gnu: python-cfn-lint: Honor #:tests? flag., guix-commits, 2021/12/11
- 12/15: gnu: python-s3transfer: Honor #:tests? flag., guix-commits, 2021/12/11
- 13/15: gnu: Update awscli, python-boto3 and python-botocore., guix-commits, 2021/12/11
- 11/15: gnu: python-s3transfer: Update to 0.5.0., guix-commits, 2021/12/11
- 15/15: gnu: python-moto: Honor #:tests? flag., guix-commits, 2021/12/11
- 14/15: gnu: python-moto: Update to 2.2.12., guix-commits, 2021/12/11