mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
Update regex to new versioning scheme.
This commit is contained in:
parent
15c99f37c0
commit
77e74caf3a
@ -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}))?'
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user