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