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

FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

Browse source
This commit is contained in:
Andres Montalban 2016-04-07 12:11:54 -03:00 • committed by Mike Place
parent a36866d7db
commit 690addf0b4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/pkgng.py
View file

@ -262,7 +262,11 @@ def latest_version(*names, **kwargs):
quiet = False
for name in names:
cmd = [_pkg(jail, chroot), 'search', '-S', 'name', '-Q', 'version', '-e']
# FreeBSD supports packages in format java/openjdk7
if '/' in name:
cmd = [_pkg(jail, chroot), 'search']
else:
cmd = [_pkg(jail, chroot), 'search', '-S', 'name', '-Q', 'version', '-e']
if quiet:
cmd.append('-q')
cmd.append(name)