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

parse pkgng output in quiet mode for >= 1.6.0

Browse source 
Fixes #27501.
This commit is contained in:
Justin Findlay 2015-09-29 14:48:30 -06:00
parent 6d773f66c3
commit 5e9107b970
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
salt/modules/pkgng.py
View file

@ -70,6 +70,13 @@ def _pkg(jail=None, chroot=None):
return ret
def _get_pkgng_version(jail=None, chroot=None):
'''
return the version of 'pkg'
'''
return __salt__['cmd.run']([_pkg(jail, chroot), '--version']).strip()
def _get_version(name, results):
'''
``pkg search`` will return all packages for which the pattern is a match.
@ -241,6 +248,7 @@ def latest_version(*names, **kwargs):
if len(names) == 0:
return ''
ret = {}
# Initialize the dict with empty strings
for name in names:
ret[name] = ''
@ -248,8 +256,17 @@ def latest_version(*names, **kwargs):
chroot = kwargs.get('chroot')
pkgs = list_pkgs(versions_as_list=True, jail=jail, chroot=chroot)
if salt.utils.compare_versions(_get_pkgng_version(jail, chroot), '>=', '1.6.0'):
quiet = True
else:
quiet = False
for name in names:
cmd = '{0} search {1}'.format(_pkg(jail, chroot), name)
cmd = [_pkg(jail, chroot), 'search']
if quiet:
cmd.append('-q')
cmd.append(name)
pkgver = _get_version(
name,
__salt__['cmd.run'](cmd, python_shell=False, output_loglevel='trace')