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

Jump to bottom

Handle Chocolatey's new Enhanced Exit Codes #52209

Merged
merged 2 commits into from
Apr 12, 2019
Merged

Handle Chocolatey's new Enhanced Exit Codes #52209

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfdc47b
Handle new enhanced retcode 2
twangboy Mar 21, 2019
7aec2d3
Merge branch '2018.3' into fix_choco_retcode
twangboy Mar 28, 2019
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
7 changes: 6 additions & 1 deletion salt/modules/chocolatey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,12 @@ def list_(narrow=None,

result = __salt__['cmd.run_all'](cmd, python_shell=False)

if result['retcode'] != 0:
# Chocolatey introduced Enhanced Exit Codes starting with version 0.10.12
# Exit Code 2 means there were no results, but is not a failure
# This may start to effect other functions in the future as Chocolatey
# moves more functions to this new paradigm
# https://github.com/chocolatey/choco/issues/1758
if result['retcode'] not in [0, 2]:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
Expand Down