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

Skip version checking for targeted packages in pkg.latest state

Browse source 
The mere fact that we have run pkg.latest_version will tell us if an
upgrade is available, by the value for that package name being a
non-empty string. So, performing version-checking here is overkill.
This commit is contained in:
Erik Johnson 2016-07-01 13:36:15 -05:00
parent 45b8fb10d7
commit 667f31a72a
1 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
salt/states/pkg.py
View file

@ -1578,31 +1578,18 @@ def latest(
targets = {}
problems = []
cmp_func = __salt__.get('pkg.version_cmp')
minion_os = __salt__['grains.item']('os')['os']
if minion_os == 'Gentoo' and watch_flags:
for pkg in desired_pkgs:
if not avail[pkg] and not cur[pkg]:
msg = 'No information found for {0!r}.'.format(pkg)
for pkg in desired_pkgs:
if not avail[pkg]:
if not cur[pkg]:
msg = 'No information found for \'{0}\'.'.format(pkg)
log.error(msg)
problems.append(msg)
else:
if salt.utils.compare_versions(ver1=cur[pkg], oper='!=', ver2=avail[pkg], cmp_func=cmp_func):
targets[pkg] = avail[pkg]
else:
if not cur[pkg] or __salt__['portage_config.is_changed_uses'](pkg):
targets[pkg] = avail[pkg]
else:
for pkg in desired_pkgs:
if pkg not in avail:
if not cur.get(pkg):
msg = 'No information found for \'{0}\'.'.format(pkg)
log.error(msg)
problems.append(msg)
elif not cur.get(pkg) \
or salt.utils.compare_versions(ver1=cur[pkg], oper='<', ver2=avail[pkg], cmp_func=cmp_func):
elif watch_flags \
and __grains__.get('os') == 'Gentoo' \
and __salt__['portage_config.is_changed_uses'](pkg):
targets[pkg] = avail[pkg]
else:
targets[pkg] = avail[pkg]
if problems:
return {