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

salt.modules.pkgng: Fix incorrect usage of _pkg()

Browse source 
Resolves #33529.
This commit is contained in:
Erik Johnson 2016-05-31 15:00:27 -05:00
parent b379dc57fd
commit 4ad80d29b6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/modules/pkgng.py
View file

@ -97,7 +97,8 @@ def _get_pkgng_version(jail=None, chroot=None):
'''
return the version of 'pkg'
'''
return __salt__['cmd.run']([_pkg(jail, chroot), '--version']).strip()
cmd = _pkg(jail, chroot) + ['--version']
return __salt__['cmd.run'](cmd).strip()
def _get_version(name, results):
@ -287,9 +288,9 @@ def latest_version(*names, **kwargs):
for name in names:
# FreeBSD supports packages in format java/openjdk7
if '/' in name:
cmd = [_pkg(jail, chroot), 'search']
cmd = _pkg(jail, chroot) + ['search']
else:
cmd = [_pkg(jail, chroot), 'search', '-S', 'name', '-Q', 'version', '-e']
cmd = _pkg(jail, chroot) + ['search', '-S', 'name', '-Q', 'version', '-e']
if quiet:
cmd.append('-q')
cmd.append(name)