Fixes idempotency issue when upgrading chocolatey packages (#21476)

8 years ago · 9be30f2eca
parent 89cf8d83e4
commit 9be30f2eca
1 changed files with 2 additions and 2 deletions
--- a/lib/ansible/modules/windows/win_chocolatey.ps1
+++ b/lib/ansible/modules/windows/win_chocolatey.ps1
@ -198,7 +198,7 @@ Function Choco-Upgrade
        $cmd += " --execution-timeout=$executiontimeout"
    }

-    $results = invoke-expression $cmd
+    $output = invoke-expression $cmd

    $result.rc = $LastExitCode
    if ($LastExitCode -notin $successexitcodes)
@ -208,7 +208,7 @@ Function Choco-Upgrade
        Throw "Error installing $package"
    }

-    if ("$output" -match ' upgraded (\d+)/\d+ package\(s\)\. ')
+    if ("$output" -match ' upgraded (\d+)/\d+ package')
    {
        if ($matches[1] -gt 0)
        {