Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update windows pkg.[install|remove] error logic #33321

Merged
merged 2 commits into from
May 20, 2016
Merged

Update windows pkg.[install|remove] error logic #33321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
539591e
Update windows pkg.install error logic
lorengordon May 17, 2016
a98bf9a
Update retcode logic of pkg.remove
lorengordon May 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 37 additions & 23 deletions salt/modules/win_pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,16 +708,23 @@ def install(name=None, refresh=False, pkgs=None, saltenv='base', **kwargs):
cmd.append(cached_pkg)
cmd.extend(shlex.split(install_flags))
# Launch the command
result = __salt__['cmd.run_stdout'](cmd,
cache_path,
output_loglevel='trace',
python_shell=False)
if result:
log.error('Failed to install {0}'.format(pkg_name))
log.error('error message: {0}'.format(result))
ret[pkg_name] = {'failed': result}
else:
result = __salt__['cmd.run_all'](cmd,
cache_path,
output_loglevel='quiet',
python_shell=False,
redirect_stderr=True)
if not result['retcode']:
ret[pkg_name] = {'install status': 'success'}
changed.append(pkg_name)
elif result['retcode'] == 3010:
# 3010 is ERROR_SUCCESS_REBOOT_REQUIRED
ret[pkg_name] = {'install status': 'success, reboot required'}
changed.append(pkg_name)
else:
log.error('Failed to install {0}'.format(pkg_name))
log.error('retcode {0}'.format(result['retcode']))
log.error('installer output: {0}'.format(result['stdout']))
ret[pkg_name] = {'install status': 'failed'}

# Get a new list of installed software
new = list_pkgs()
Expand Down Expand Up @@ -746,12 +753,16 @@ def install(name=None, refresh=False, pkgs=None, saltenv='base', **kwargs):
log.debug("Try {0}".format(tries))
if tries == 10:
if not latest:
ret['_comment'] = 'Software not found in the registry.\n' \
'Could be a problem with the Software\n' \
'definition file. Verify the full_name\n' \
'and the version match the registry ' \
'exactly.\n' \
'Failed after {0} tries.'.format(tries)
log.error('Software not found in the registry. Could be '
'a problem with the software definition file. '
'Verify the full_name and the version match the '
'registry exactly. Alternatively, the software may '
'have installed successfully, but is applied to '
'this OS version as a Windows update, which '
'`pkg.install` cannot currently check; if that is '
'the case, this message may be ignored. Stopped '
'checking after {0} tries.'
.format(tries))

# Compare the software list before and after
# Add the difference to ret
Expand Down Expand Up @@ -954,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()
Expand Down