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

Lint fixes

Browse source
This commit is contained in:
Erik Johnson 2016-01-22 10:46:50 -06:00
parent 43829ecee6
commit e85ad690fb
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/modules/yumpkg.py
View file

@ -30,7 +30,6 @@ from distutils.version import LooseVersion as _LooseVersion # pylint: disable=n
# Import 3rd-party libs
# pylint: disable=import-error,redefined-builtin
import salt.ext.six as six
from salt.ext.six import string_types
from salt.ext.six.moves import shlex_quote as _cmd_quote
try:
@ -108,20 +107,6 @@ def _repoquery_pkginfo(repoquery_args):
return ret
def _yum():
'''
return yum or dnf depending on version
'''
contextkey = 'yum_bin'
if contextkey not in __context__:
if 'fedora' in __grains__['os'].lower() \
and int(__grains__['osrelease']) >= 22:
__context__[contextkey] = 'dnf'
else:
__context__[contextkey] = 'yum'
return __context__[contextkey]
def _check_repoquery():
'''
Check for existence of repoquery and install yum-utils if it is not
@ -513,7 +498,7 @@ def latest_version(*names, **kwargs):
matches = []
for pkg in (x for x in pkgs if x.name == name):
if pkg.arch == 'noarch' or pkg.arch == namearch_map[name] \
or _check_32(pkg.arch):
or salt.utils.pkg.rpm.check_32(pkg.arch):
matches.append(pkg.version)
sorted_matches = sorted(
[_LooseVersion(x) for x in matches],