~ruther/guix-local: upstream: Reject bogus archive type guesses.

618f0582b49edb0a5f633c953b00fc93d03c077a — Ludovic Courtès 8 years ago 68f1869

upstream: Reject bogus archive type guesses.

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.

patch browse .tar.gz .zip

1 files changed, 7 insertions(+), 1 deletions(-)

M guix/upstream.scm

M guix/upstream.scm => guix/upstream.scm +7 -1

@@ 278,7 278,13 @@ and 'interactive' (default)."
                    ((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)