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

Fix win_unzip module hang on error (#20364)

Browse source 
* Fix win_unzip module hang on error

* Add documentation link for Folder.CopyHere flags
This commit is contained in:
camradal 2017-01-18 12:44:18 -08:00 committed by John R Barker
parent cc5080bc8a
commit e81d3f71e2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,8 +62,9 @@ If ($ext -eq ".zip" -And $recurse -eq $false) {
$shell = New-Object -ComObject Shell.Application
$zipPkg = $shell.NameSpace([IO.Path]::GetFullPath($src))
$destPath = $shell.NameSpace([IO.Path]::GetFullPath($dest))
# 20 means do not display any dialog (4) and overwrite any file (16)
$destPath.CopyHere($zipPkg.Items(), 20)
# From Folder.CopyHere documentation (https://msdn.microsoft.com/en-us/library/windows/desktop/bb787866.aspx)
# 1044 means do not display any error dialog (1024), progress dialog (4) and overwrite any file (16)
$destPath.CopyHere($zipPkg.Items(), 1044)
$result.changed = $true
}
Catch {