From a98bf9a9a4619d4724ee7f23a7693f487cff50f3 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 17 May 2016 16:17:49 -0400 Subject: [PATCH] Update retcode logic of pkg.remove --- salt/modules/win_pkg.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/salt/modules/win_pkg.py b/salt/modules/win_pkg.py index 0bbb078b6221..86a5cf72ed0b 100644 --- a/salt/modules/win_pkg.py +++ b/salt/modules/win_pkg.py @@ -965,15 +965,18 @@ def remove(name=None, pkgs=None, version=None, **kwargs): cmd.append(expanded_cached_pkg) cmd.extend(shlex.split(uninstall_flags)) # Launch the command - result = __salt__['cmd.run_stdout'](cmd, - output_loglevel='trace', - python_shell=False) - if result: - log.error('Failed to install {0}'.format(target)) - log.error('error message: {0}'.format(result)) - ret[target] = {'failed': result} - else: + result = __salt__['cmd.run_all'](cmd, + output_loglevel='trace', + python_shell=False, + redirect_stderr=True) + if not result['retcode']: + ret[target] = {'uninstall status': 'success'} changed.append(target) + else: + log.error('Failed to remove {0}'.format(target)) + log.error('retcode {0}'.format(result['retcode'])) + log.error('uninstaller output: {0}'.format(result['stdout'])) + ret[target] = {'uninstall status': 'failed'} # Get a new list of installed software new = list_pkgs()