summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-11-29 22:14:34 +0100
committerLudovic Courtès <ludo@gnu.org>2014-11-29 22:34:59 +0100
commitf5d9604f27bb7e9efcdbd1f384017b9cd9fe89ff (patch)
tree3014377665077ce66aa7b50903c0fccd7a5039a5
parent2184ed9179a5e858283f2569a6bc965e47c8dbbd (diff)
downloadpatches-f5d9604f27bb7e9efcdbd1f384017b9cd9fe89ff.tar
patches-f5d9604f27bb7e9efcdbd1f384017b9cd9fe89ff.tar.gz
gnu-maintenance: Support .zip files.
Reported by Andreas Enge <andreas@enge.fr>. * guix/gnu-maintenance.scm (sans-extension): Add case for ".zip". (%tarball-rx): Extend to handle .zip extension.
-rw-r--r--guix/gnu-maintenance.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index ee84446549..0528e9f253 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -233,12 +233,14 @@ stored."
(values "ftp.gnu.org" (string-append "/gnu/" project)))))
(define (sans-extension tarball)
- "Return TARBALL without its .tar.* extension."
- (let ((end (string-contains tarball ".tar")))
+ "Return TARBALL without its .tar.* or .zip extension."
+ (let ((end (or (string-contains tarball ".tar")
+ (string-contains tarball ".zip"))))
(substring tarball 0 end)))
(define %tarball-rx
- (make-regexp "^(.+)-([0-9]|[^-])*(-src)?\\.tar\\."))
+ ;; Note: .zip files are notably used for freefont-ttf.
+ (make-regexp "^(.+)-([0-9]|[^-])*(-src)?\\.(tar\\.|zip$)"))
(define %alpha-tarball-rx
(make-regexp "^.*-.*[0-9](-|~)?(alpha|beta|rc|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))