saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove suse/redhat checks, refactor code.

Browse source
This commit is contained in:
Bo Maryniuk 2016-03-30 17:06:50 +02:00
parent 30c8f7216b
commit 0a68ebff16
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
salt/modules/rpm.py
View file

@ -580,26 +580,20 @@ def version_cmp(ver1, ver2):
salt '*' pkg.version_cmp '0.2-001' '0.2.0.1-002'
'''
os_family = __grains__['os_family'].lower()
try:
if os_family == 'suse' and HAS_RPM:
cmp_result = rpm.labelCompare(salt.utils.str_version_to_evr(ver1),
salt.utils.str_version_to_evr(ver2))
elif os_family == 'redhat' and HAS_RPMUTILS:
cmp_result = rpmUtils.miscutils.compareEVR(rpmUtils.miscutils.stringToVersion(ver1),
rpmUtils.miscutils.stringToVersion(ver2))
if HAS_RPM:
cmp_func = rpm.labelCompare
elif HAS_RPMUTILS:
cmp_func = rpmUtils.miscutils.compareEVR
else:
cmp_result = None
cmp_func = None
cmp_result = cmp_func is not None and cmp_func(salt.utils.str_version_to_evr(ver1),
salt.utils.str_version_to_evr(ver2)) or None
if cmp_result not in (-1, 0, 1):
raise Exception(
'cmp result \'{0}\' is invalid'.format(cmp_result)
)
raise Exception("Comparison result '{0}' is invalid".format(cmp_result))
return cmp_result
except Exception as exc:
log.warning(
'Failed to compare version \'%s\' to \'%s\' using '
'rpmUtils: %s', ver1, ver2, exc
)
log.warning("Failed to compare version '{0}' to '{1}' using RPM: {2}".format(ver1, ver2, exc))
return salt.utils.version_cmp(ver1, ver2)