chocolatey-visualstudio.extension: ignore null exit code when waiting…

… for VS installer processes GitHub-Issue: GH-13
jberezanski · May 15, 2018 · 8a72da5 · 8a72da5
1 parent 128c24c
commit 8a72da5
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/chocolatey-visualstudio.extension/extensions/Wait-VSInstallerProcesses.ps1 b/chocolatey-visualstudio.extension/extensions/Wait-VSInstallerProcesses.ps1
@@ -37,7 +37,7 @@ function Wait-VSInstallerProcesses
             {
                 $exitCode = $proc.ExitCode
             }
-            if ($proc.ExitCode -ne 0)
+            if ($proc.ExitCode -ne 0 -and $proc.ExitCode -ne $null)
             {
                 Write-Warning "$($proc.Name) process $($proc.Id) exited with code $($proc.ExitCode)"
                 if ($exitCode -eq 0)
@@ -47,7 +47,14 @@ function Wait-VSInstallerProcesses
             }
             else
             {
-                Write-Debug "$($proc.Name) process $($proc.Id) exited with code $($proc.ExitCode)"
+                if ($proc.ExitCode -ne $null)
+                {
+                    Write-Debug "$($proc.Name) process $($proc.Id) exited with code $($proc.ExitCode)"
+                }
+                else
+                {
+                    Write-Debug "$($proc.Name) process $($proc.Id) exited, exit code unknown"
+                }
             }
         }
     }
@@ -89,17 +96,24 @@ function Wait-VSInstallerProcesses
             {
                 $exitCode = $proc.ExitCode
             }
-            if ($proc.ExitCode -ne 0)
+            if ($proc.ExitCode -ne 0 -and $proc.ExitCode -ne $null)
             {
-                Write-Warning "vs_installer.windows.exe process $($proc.Id) exited with code $($proc.ExitCode)"
+                Write-Warning "$($proc.Name) process $($proc.Id) exited with code $($proc.ExitCode)"
                 if ($exitCode -eq 0)
                 {
                     $exitCode = $proc.ExitCode
                 }
             }
             else
             {
-                Write-Debug "vs_installer.windows.exe process $($proc.Id) exited with code $($proc.ExitCode)"
+                if ($proc.ExitCode -ne $null)
+                {
+                    Write-Debug "$($proc.Name) process $($proc.Id) exited with code $($proc.ExitCode)"
+                }
+                else
+                {
+                    Write-Debug "$($proc.Name) process $($proc.Id) exited, exit code unknown"
+                }
             }
         }
     }