External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 22:19:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5692 from ghjm/windows_scan_packages_fix

Browse Source 
Fix case where Get-ChildItems does not return any results
This commit is contained in:
Graham Mainwaring
2017-03-10 16:52:36 -05:00
committed by GitHub
parent 5777ae4b8b 5098d0e99c
commit ead643eff4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/plugins/library/win_scan_packages.ps1
View File

@@ -25,7 +25,7 @@ if ([System.IntPtr]::Size -eq 4) {
# This is a 32-bit Windows system, so we only check for 32-bit programs, which will be # This is a 32-bit Windows system, so we only check for 32-bit programs, which will be
# at the native registry location. # at the native registry location.
$packages = Get-ChildItem -Path $uninstall_native_path | [PSObject []]$packages = Get-ChildItem -Path $uninstall_native_path |
Get-ItemProperty | Get-ItemProperty |
Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}}, Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}},
@{Name="version"; Expression={$_."DisplayVersion"}}, @{Name="version"; Expression={$_."DisplayVersion"}},
@@ -38,7 +38,7 @@ if ([System.IntPtr]::Size -eq 4) {
# This is a 64-bit Windows system, so we check for 64-bit programs in the native # This is a 64-bit Windows system, so we check for 64-bit programs in the native
# registry location, and also for 32-bit programs under Wow6432Node. # registry location, and also for 32-bit programs under Wow6432Node.
$packages = Get-ChildItem -Path $uninstall_native_path | [PSObject []]$packages = Get-ChildItem -Path $uninstall_native_path |
Get-ItemProperty | Get-ItemProperty |
Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}}, Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}},
@{Name="version"; Expression={$_."DisplayVersion"}}, @{Name="version"; Expression={$_."DisplayVersion"}},