cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

win_chocolatey - Fix incompatibilities with latest Chocolatey release (#53841)

Browse source
This commit is contained in:
Jordan Borean 2019-03-15 16:40:30 +10:00 committed by GitHub
parent e0c0e9a10b
commit cac3c6efcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/win_chocolatey-update.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- win_chocolatey - Fix incompatibilities with the latest release of Chocolatey ``v0.10.12+``

5
lib/ansible/modules/windows/win_chocolatey.ps1
View file

@ -326,7 +326,10 @@ Function Get-ChocolateyPackageVersion {
$command = Argv-ToString -arguments @($choco_path, "list", "--local-only", "--exact", "--limit-output", "--all-versions", $name) $command = Argv-ToString -arguments @($choco_path, "list", "--local-only", "--exact", "--limit-output", "--all-versions", $name)
$res = Run-Command -command $command $res = Run-Command -command $command
if ($res.rc -ne 0) {
# Chocolatey v0.10.12 introduced enhanced exit codes, 2 means no results, e.g. no package
#
if ($res.rc -notin @(0, 2)) {
$module.Result.command = $command $module.Result.command = $command
$module.Result.rc = $res.rc $module.Result.rc = $res.rc
$module.Result.stdout = $res.stdout $module.Result.stdout = $res.stdout

3
test/integration/targets/win_chocolatey/tasks/tests.yml
View file

@ -23,6 +23,7 @@
- name: get result of install package (check mode) - name: get result of install package (check mode)
win_command: choco.exe list --local-only --exact --limit-output {{ test_choco_package1|quote }} win_command: choco.exe list --local-only --exact --limit-output {{ test_choco_package1|quote }}
register: install_actual_check register: install_actual_check
failed_when: not install_actual_check.rc in [0, 2] # v0.10.12+ returns 2 for no package
- name: assert install package (check mode) - name: assert install package (check mode)
assert: assert:
@ -96,6 +97,7 @@
- name: get result of remove package - name: get result of remove package
win_command: choco.exe list --local-only --exact --limit-output {{ test_choco_package1|quote }} win_command: choco.exe list --local-only --exact --limit-output {{ test_choco_package1|quote }}
register: remove_actual register: remove_actual
failed_when: not remove_actual.rc in [0, 2]
- name: check if removed package file still exists - name: check if removed package file still exists
win_stat: win_stat:
@ -183,6 +185,7 @@
- name: get list of installed packages after removal - name: get list of installed packages after removal
win_command: choco.exe list --local-only --limit-output ansible win_command: choco.exe list --local-only --limit-output ansible
register: remove_multiple_actual register: remove_multiple_actual
failed_when: not remove_multiple_actual.rc in [0, 2]
- name: get info on package 1 - name: get info on package 1
win_stat: win_stat: