valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use salt.utils.pkg.split_comparison in pkg states

Browse Source
This commit is contained in:
Erik Johnson 2017-06-14 13:24:33 -05:00
parent 444e45b8e8
commit a268227883
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/states/pkg.py
View File

@ -158,16 +158,7 @@ def _get_comparison_spec(pkgver):
comparison operator was passed, the comparison is assumed to be an "equals"
comparison, and "==" will be the operator returned.
'''
match = re.match('^([<>])?(=)?([^<>=]+)$', pkgver)
if not match:
raise CommandExecutionError(
'Invalid version specification \'{0}\'.'.format(pkgver)
)
gt_lt, eq, verstr = match.groups()
oper = gt_lt or ''
oper += eq or ''
# A comparison operator of "=" is redundant, but possible.
# Change it to "==" so that the version comparison works
oper, verstr = salt.utils.pkg.split_comparison(pkgver)
if oper in ('=', ''):
oper = '=='
return oper, verstr