guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: gnu-maintenance: Recognize "-source" tarball suffix.


From: guix-commits
Subject: 01/03: gnu-maintenance: Recognize "-source" tarball suffix.
Date: Mon, 29 Mar 2021 17:34:19 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 1575da60628cf2594cd7b1ab0812ec4c50ac5092
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 29 17:28:34 2021 +0200

    gnu-maintenance: Recognize "-source" tarball suffix.
    
    Fixes <https://bugs.gnu.org/47398>.
    Reported by Léo Le Bouter <lle-bout@zaclys.net>.
    
    * guix/gnu-maintenance.scm (%tarball-rx): Add "-[Ss]ource" suffix.
    * tests/gnu-maintenance.scm ("release-file?"): Add exiv2 example.
---
 guix/gnu-maintenance.scm  | 2 +-
 tests/gnu-maintenance.scm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 031a899..4078e1f 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -242,7 +242,7 @@ network to check in GNU's database."
   ;; The "-src" pattern is for "TeXmacs-1.0.7.9-src.tar.gz".
   ;; The "-gnu[0-9]" pattern is for "icecat-38.4.0-gnu1.tar.bz2".
   ;; Accept underscores as in "PKG_1.2.tar.gz" for some non-GNU packages.
-  (make-regexp "^([^.]+)[-_]([0-9]|[^-])+(-(src|gnu[0-9]))?\\.(tar\\.|zip$)"))
+  (make-regexp 
"^([^.]+)[-_]([0-9]|[^-])+(-(src|[sS]ource|gnu[0-9]))?\\.(tar\\.|zip$)"))
 
 (define %alpha-tarball-rx
   (make-regexp 
"^.*-.*[0-9](-|~)?(alpha|beta|rc|RC|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))
diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm
index a3e48a0..59e7990 100644
--- a/tests/gnu-maintenance.scm
+++ b/tests/gnu-maintenance.scm
@@ -30,7 +30,8 @@
                 ("texmacs" "TeXmacs-1.0.7.9-src.tar.gz")
                 ("icecat" "icecat-38.4.0-gnu1.tar.bz2")
                 ("mit-scheme" "mit-scheme-9.2.tar.gz")
-                ("mediainfo" "mediainfo_20.09.tar.xz")))
+                ("mediainfo" "mediainfo_20.09.tar.xz")
+                ("exiv2" "exiv2-0.27.3-Source.tar.gz")))
        (every (lambda (project+file)
                 (not (apply release-file? project+file)))
               '(("guile" "guile-www-1.1.1.tar.gz")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]