mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
win_chocolatey - Fix incompatibilities with latest Chocolatey release (#53841)
This commit is contained in:
parent
e0c0e9a10b
commit
cac3c6efcf
3 changed files with 9 additions and 1 deletions
2
changelogs/fragments/win_chocolatey-update.yaml
Normal file
2
changelogs/fragments/win_chocolatey-update.yaml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- win_chocolatey - Fix incompatibilities with the latest release of Chocolatey ``v0.10.12+``
|
|
@ -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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in a new issue