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

Merge pull request #24399 from makinacorpus/versionvirtual

Browse source 
Versionvirtual
This commit is contained in:
Colton Myers 2015-06-04 12:02:22 -06:00
commit 27f109bd76
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/states/pkg.py
View file

@ -1262,6 +1262,7 @@ def latest(
targets = {}
problems = []
cmp_func = __salt__.get('pkg.version_cmp', __salt__.get('version_cmp'))
for pkg in desired_pkgs:
if not avail[pkg]:
if not cur[pkg]:
@ -1269,11 +1270,10 @@ def latest(
log.error(msg)
problems.append(msg)
elif not cur[pkg] \
or salt.utils.compare_versions(
ver1=cur[pkg],
oper='<',
ver2=avail[pkg],
cmp_func=__salt__.get('version_cmp')):
or salt.utils.compare_versions(ver1=cur[pkg],
oper='<',
ver2=avail[pkg],
cmp_func=cmp_func):
targets[pkg] = avail[pkg]
if problems: