[sysadmin-bin] force versions to only have either dots or dashes, not a mix to allow for gnome-2048 (bug 748789)

[Olav Vitters <ovitters src gnome org>]

commit 6e6700a7ccb06cf0c27460ad9ca677d62938122a
Author: Olav Vitters <olav vitters nl>
Date:   Tue May 26 23:21:46 2015 +0200

    force versions to only have either dots or dashes, not a mix to allow for gnome-2048 (bug 748789)

 ftpadmin |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/ftpadmin b/ftpadmin
index 4fb671d..fa8360c 100755
--- a/ftpadmin
+++ b/ftpadmin
@@ -50,7 +50,7 @@ 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]+)\.(?P<format>(?:tar\.|diff\.)?[a-z][a-z0-9]*)$')
+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_version = re.compile(r'([-.]|\d+|[^-.\d]+)')
 re_who = re.compile(r' <[^>]+>$')