valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkgng.py: raise exception if changes fail

Browse Source 
This uses the new 'info' param for the CommandExecutionError exception
to allow us to report partial changes when there are errors.
This commit is contained in:
Erik Johnson 2015-12-15 14:29:23 -06:00
parent 524dbf7d52
commit cb586184cb
1 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
salt/modules/pkgng.py
View File

@ -794,11 +794,29 @@ def install(name=None,
# pkg add doesn't have a dryrun mode, so echo out what will be run # pkg add doesn't have a dryrun mode, so echo out what will be run
return ' '.join(cmd) return ' '.join(cmd)
__salt__['cmd.run'](cmd, output_loglevel='trace', python_shell=False) out = __salt__['cmd.run_all'](
cmd,
output_loglevel='trace',
python_shell=False
)
if out['retcode'] != 0 and out['stderr']:
errors = [out['stderr']]
else:
errors = []
__context__.pop(_contextkey(jail, chroot), None) __context__.pop(_contextkey(jail, chroot), None)
__context__.pop(_contextkey(jail, chroot, prefix='pkg.origin'), None) __context__.pop(_contextkey(jail, chroot, prefix='pkg.origin'), None)
new = list_pkgs(jail=jail, chroot=chroot) new = list_pkgs(jail=jail, chroot=chroot)
return salt.utils.compare_dicts(old, new) ret = salt.utils.compare_dicts(old, new)
if errors:
raise CommandExecutionError(
'Problem encountered installing package(s)',
info={'errors': errors, 'changes': ret}
)
return ret
def remove(name=None, def remove(name=None,
@ -945,11 +963,30 @@ def remove(name=None,
if opts: if opts:
cmd.append('-' + opts) cmd.append('-' + opts)
cmd.extend(targets) cmd.extend(targets)
__salt__['cmd.run'](cmd, output_loglevel='trace', python_shell=False)
out = __salt__['cmd.run_all'](
cmd,
output_loglevel='trace',
python_shell=False
)
if out['retcode'] != 0 and out['stderr']:
errors = [out['stderr']]
else:
errors = []
__context__.pop(_contextkey(jail, chroot), None) __context__.pop(_contextkey(jail, chroot), None)
__context__.pop(_contextkey(jail, chroot, prefix='pkg.origin'), None) __context__.pop(_contextkey(jail, chroot, prefix='pkg.origin'), None)
new = list_pkgs(jail=jail, chroot=chroot, with_origin=True) new = list_pkgs(jail=jail, chroot=chroot, with_origin=True)
return salt.utils.compare_dicts(old, new) ret = salt.utils.compare_dicts(old, new)
if errors:
raise CommandExecutionError(
'Problem encountered removing package(s)',
info={'errors': errors, 'changes': ret}
)
return ret
# Support pkg.delete to remove packages, since this is the CLI usage # Support pkg.delete to remove packages, since this is the CLI usage
delete = salt.utils.alias_function(remove, 'delete') delete = salt.utils.alias_function(remove, 'delete')
@ -1050,21 +1087,21 @@ def upgrade(*names, **kwargs):
cmd.extend(names) cmd.extend(names)
old = list_pkgs() old = list_pkgs()
call = __salt__['cmd.run_all']( call = __salt__['cmd.run_all'](cmd,
cmd, output_loglevel='trace',
output_loglevel='trace', python_shell=False,
python_shell=False redirect_stderr=True)
)
if call['retcode'] != 0: if call['retcode'] != 0:
ret['result'] = False ret['result'] = False
if 'stderr' in call: if call['stdout']:
ret['comment'] += call['stderr'] ret['comment'] = call['stdout']
if 'stdout' in call:
ret['comment'] += call['stdout'] __context__.pop(_contextkey(jail, chroot), None)
else: __context__.pop(_contextkey(jail, chroot, prefix='pkg.origin'), None)
__context__.pop('pkg.list_pkgs', None) new = list_pkgs()
new = list_pkgs() ret['changes'] = salt.utils.compare_dicts(old, new)
ret['changes'] = salt.utils.compare_dicts(old, new)
return ret return ret