nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upstream: Use first url when it lacks an extension. 

* guix/upstream.scm (package-update): Use a url from the list when it
  lacks an extension.
This commit is contained in:
Ludovic Courtès 2016-09-28 16:17:07 +02:00 committed by David Craven
parent ce3f92e701
commit af72a21a69
No known key found for this signature in database
GPG Key ID: C5E051C79C0BECDB
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/upstream.scm
View File

@ -241,12 +241,16 @@ and 'interactive' (default)."
((archive-type) ((archive-type)
(match (and=> (package-source package) origin-uri) (match (and=> (package-source package) origin-uri)
((? string? uri) ((? string? uri)
(or (file-extension uri) "gz")) (file-extension uri))
(_ (_
"gz"))) "gz")))
((url signature-url) ((url signature-url)
(find2 (lambda (url sig-url) (find2 (lambda (url sig-url)
(string-suffix? archive-type url)) ;; Some URIs lack a file extension, like
;; 'https://crates.io/???/0.1/download'. In that
;; case, pick the first URL.
(or (not archive-type)
(string-suffix? archive-type url)))
urls urls
(or signature-urls (circular-list #f))))) (or signature-urls (circular-list #f)))))
(let ((tarball (download-tarball store url signature-url (let ((tarball (download-tarball store url signature-url