[releng/carlosg/handle-semver: 2/2] convert-to-tarballs: Include prerelease identifiers in version regexp



commit 97016f2f3b66199d726b48ded290cf5f120b5052
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Nov 15 23:48:03 2018 +0100

    convert-to-tarballs: Include prerelease identifiers in version regexp
    
    So those can be extracted and compared. Also, remove comment about
    "stupid inane tarballs" that at this point I find offending.

 tools/smoketesting/convert-to-tarballs.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index a6d024a..593be9b 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -638,9 +638,8 @@ class TarballLocator:
         # Only include tarballs for the given module
         tarballs = [tarball for tarball in tarballs if modulename in tarball]
 
-        re_tarball = r'^'+re.escape(modulename)+'[_-](([0-9]+[\.\-])*[0-9]+)(\.orig)?\.tar.*$'
-        ## Don't include -beta -installer -stub-installer and all kinds of
-        ## other stupid inane tarballs, and also filter tarballs that have a
+        re_tarball = r'^'+re.escape(modulename)+'[_-](([0-9]+[\.\-])*[0-9]+[^0-9\.]?[^\.]*)(\.orig)?\.tar.*$'
+        ## filter tarballs that have a
         ## name that includes the module name but is different (eg, Gnome2-VFS
         ## instead of Gnome2)
         tarballs = filter(lambda t: re.search(re_tarball, t), tarballs)


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