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

win_file: fix error when creating an existing dir (#19070)

Browse source 
If something else created the dir New-Item will throw an exception and
the task will fail. Check the existing file and as long as it's a dir,
we don't need to error out.
This commit is contained in:
Andrea Scarpino 2017-03-17 17:33:57 +01:00 committed by Matt Davis
parent 011b324638
commit c80d696cec
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/windows/win_file.ps1
View file

@ -66,7 +66,7 @@ function Remove-File($file, $checkmode) {
Remove-Item -Path $file.FullName -Force -WhatIf:$checkmode
}
} catch [Exception] {
Fail-Json (New-Object psobject) "Failed to delete $($file.FullName): $($_.Exception.Message)"
Fail-Json $result "Failed to delete $($file.FullName): $($_.Exception.Message)"
}
}
@ -116,7 +116,18 @@ if (Test-Path $path) {
}
if ($state -eq "directory") {
New-Item -Path $path -ItemType Directory -WhatIf:$check_mode | Out-Null
try {
New-Item -Path $path -ItemType Directory -WhatIf:$check_mode | Out-Null
} catch {
if ($_.CategoryInfo.Category -eq "ResourceExists") {
$fileinfo = Get-Item $_.CategoryInfo.TargetName
if ($state -eq "directory" -and -not $fileinfo.PsIsContainer) {
Fail-Json $result "path $path is not a directory"
}
} else {
Fail-Json $result $_.Exception.Message
}
}
$result.changed = $true
} elseif ($state -eq "file") {
Fail-Json $result "path $path will not be created"