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

Validate return code and fail properly (#2334)

Browse source 
This fixes #2333
This commit is contained in:
Dag Wieers 2016-06-10 19:24:43 +02:00 committed by Matt Clay
parent 3d2ad47f55
commit 7e5e9bd7e8
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/modules/extras/windows/win_regmerge.ps1
View file

@ -69,9 +69,14 @@ If ( $do_comparison -eq $True ) {
{
# Something is different, actually do reg merge
$reg_import_args = @("IMPORT", "$path")
& reg.exe $reg_import_args
Set-Attr $result "changed" $True
Set-Attr $result "difference_count" $comparison_result.count
$ret = & reg.exe $reg_import_args 2>&1
If ($LASTEXITCODE -eq 0) {
Set-Attr $result "changed" $True
Set-Attr $result "difference_count" $comparison_result.count
} Else {
Set-Attr $result "rc" $LASTEXITCODE
Fail-Json $result "$ret"
}
} Else {
Set-Attr $result "difference_count" 0
}
@ -82,9 +87,14 @@ If ( $do_comparison -eq $True ) {
} Else {
# not comparing, merge and report changed
$reg_import_args = @("IMPORT", "$path")
& reg.exe $reg_import_args
Set-Attr $result "changed" $True
Set-Attr $result "compared" $False
$ret = & reg.exe $reg_import_args 2>&1
If ( $LASTEXITCODE -eq 0 ) {
Set-Attr $result "changed" $True
Set-Attr $result "compared" $False
} Else {
Set-Attr $result "rc" $LASTEXITCODE
Fail-Json $result "$ret"
}
}
Exit-Json $result