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

Fail pkg.uptodate if expected packages are not upgraded

Browse source
This commit is contained in:
Adam Mendlik 2017-12-23 08:41:10 -07:00
parent 29ef67bac2
commit 2a7d76ad6e
No known key found for this signature in database
GPG key ID: BD2747BB4A930106
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/states/pkg.py
View file

@ -2846,10 +2846,10 @@ def uptodate(name, refresh=False, pkgs=None, **kwargs):
try:
packages = __salt__['pkg.list_upgrades'](refresh=refresh, **kwargs)
expected = {pkgname: {'new': pkgver, 'old': __salt__['pkg.version'](pkgname)}
for pkgname, pkgver in six.iteritems(packages)}
for pkgname, pkgver in packages.iteritems()}
if isinstance(pkgs, list):
packages = [pkg for pkg in packages if pkg in pkgs]
expected = {pkgname: pkgver for pkgname, pkgver in six.iteritems(expected) if pkgname in pkgs}
expected = {pkgname: pkgver for pkgname, pkgver in expected.iteritems() if pkgname in pkgs}
except Exception as exc:
ret['comment'] = str(exc)
return ret
@ -2880,8 +2880,17 @@ def uptodate(name, refresh=False, pkgs=None, **kwargs):
'packages: {0}'.format(exc))
return ret
ret['comment'] = 'Upgrade ran successfully'
ret['result'] = True
# If a package list was provided, ensure those packages were updated
missing = []
if isinstance(pkgs, list):
missing = [pkg for pkg in six.iterkeys(expected) if pkg not in ret['changes']]
if missing:
ret['comment'] = 'The following package(s) failed to update: {0}'.format(', '.join(missing))
ret['result'] = False
else:
ret['comment'] = 'Upgrade ran successfully'
ret['result'] = True
return ret