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

win_package: remove case sensitive check for msi extension (#34476)

Browse source
This commit is contained in:
Jordan Borean 2018-01-05 07:11:22 +10:00 committed by GitHub
parent 85ff38d2e2
commit da69f5aeae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/windows/win_package.ps1
View file

@ -173,7 +173,7 @@ Function Get-ProgramMetadata($state, $path, $product_id, $credential, $creates_p
# set the location type and validate the path # set the location type and validate the path
if ($path -ne $null) { if ($path -ne $null) {
if ($path.EndsWith(".msi")) { if ($path.EndsWith(".msi", [System.StringComparison]::CurrentCultureIgnoreCase)) {
$metadata.msi = $true $metadata.msi = $true
} else { } else {
$metadata.msi = $false $metadata.msi = $false

6
test/integration/targets/win_package/tasks/msi_tests.yml
View file

@ -267,7 +267,7 @@
- name: install local msi with arguments (check mode) - name: install local msi with arguments (check mode)
win_package: win_package:
path: '{{test_win_package_path}}\good.msi' path: '{{test_win_package_path}}\good.MSI'
state: present state: present
arguments: ADDLOCAL=Cow arguments: ADDLOCAL=Cow
register: install_msi_argument_check register: install_msi_argument_check
@ -293,7 +293,7 @@
- name: install local msi with arguments - name: install local msi with arguments
win_package: win_package:
path: '{{test_win_package_path}}\good.msi' path: '{{test_win_package_path}}\good.MSI'
state: present state: present
arguments: ADDLOCAL=Cow arguments: ADDLOCAL=Cow
register: install_msi_argument register: install_msi_argument
@ -319,7 +319,7 @@
- name: install local msi with arguments (idempotent) - name: install local msi with arguments (idempotent)
win_package: win_package:
path: '{{test_win_package_path}}\good.msi' path: '{{test_win_package_path}}\good.MSI'
state: present state: present
arguments: ADDLOCAL=Cow arguments: ADDLOCAL=Cow
register: install_msi_argument_again register: install_msi_argument_again