ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

upstream: Reject bogus archive type guesses.

Browse source 
This would crash 'guix refresh -u' with source URLs ending in
"…/v1.2.3".

* guix/upstream.scm (package-update): Be stricter when determining
ARCHIVE-TYPE.
This commit is contained in:
Ludovic Courtès 2017-12-19 17:57:15 +01:00 committed by Ludovic Courtès
parent 68f1869cfc
commit 618f0582b4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
guix/upstream.scm
View file

@ -278,7 +278,13 @@ (define* (package-update store package updaters
((archive-type)
(match (and=> (package-source package) origin-uri)
((? string? uri)
(file-extension (basename uri)))
(let ((type (file-extension (basename uri))))
;; Sometimes we have URLs such as
;; "https://github.com/…/tarball/v0.1", in which case
;; we must not consider "1" as the extension.
(and (or (string-contains type "z")
(string=? type "tar"))
type)))
(_
"gz")))
((url signature-url)