[sysadmin-bin: 1/2] Update regexes for GNOME 40 version numbers




commit ea6458baf76dcdf4c2d4473026aeb8d47a86988a
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Jan 8 09:38:40 2021 -0600

    Update regexes for GNOME 40 version numbers
    
    This makes it possible to install 40.alpha tarballs

 ftpadmin | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ftpadmin b/ftpadmin
index 1a39075..c69d70a 100755
--- a/ftpadmin
+++ b/ftpadmin
@@ -50,8 +50,8 @@ if not os.environ['USER'] in ('ovitters', 'olav'):
     DEBUG=False
 
 GROUP='ftpadmin'
-re_file = 
re.compile(r'^(?P<module>.*?)[_-](?:(?P<oldversion>([0-9]+[\.])+[0-9]+)-)?(?P<version>(?:(?:[0-9]+\.)*|(?:[0-9]+\-)*)[0-9]+)\.(?P<format>(?:tar\.|diff\.)?[a-z][a-z0-9]*)$')
-re_majmin = re.compile(r'^([0-9]+\.[0-9]+).*')
+re_file = 
re.compile(r'^(?P<module>.*?)[_-](?:(?P<oldversion>([0-9]+[\.])+[a-z0-9]+)-)?(?P<version>(?:(?:[0-9]+\.)*|(?:[0-9]+\-)*)[a-z0-9]+)\.(?P<format>(?:tar\.|diff\.)[a-z][a-z0-9]*)$')
+re_majmin = re.compile(r'^([0-9]+(\.[0-9]+)?).*')
 re_version = re.compile(r'([-.]|\d+|[^-.\d]+)')
 re_who = re.compile(r' <[^>]+>$')
 re_whitespace = re.compile("\s+")


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