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.
This commit is contained in:
		
							parent
							
								
									e68466de12
								
							
						
					
					
						commit
						cba0395c99
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue