Update regex to new versioning scheme.

This commit is contained in:
Pedro Algarvio 2014-01-02 21:08:57 +00:00
parent 15c99f37c0
commit 77e74caf3a

View File

@ -34,7 +34,7 @@ class SaltStackVersion(object):
__slots__ = ('name', 'major', 'minor', 'bugfix', 'rc', 'noc', 'sha')
git_describe_regex = re.compile(
r'(?:[^\d]+)?(?P<major>[\d]{1,2})\.(?P<minor>[\d]{1,2})'
r'(?:[^\d]+)?(?P<major>[\d]{1,4})\.(?P<minor>[\d]{1,2})'
r'(?:\.(?P<bugfix>[\d]{0,2}))?(?:rc(?P<rc>[\d]{1}))?'
r'(?:(?:.*)-(?P<noc>[\d]+)-(?P<sha>[a-z0-9]{8}))?'
)