Should overwrite env variable if it already exists

JakeGinnivan · JakeGinnivan · commit 2a5b21ae11ad · 2015-06-25T10:45:57.000+01:00
diff --git a/GitVersionCore/Helpers/ProcessHelper.cs b/GitVersionCore/Helpers/ProcessHelper.cs
@@ -36,7 +36,7 @@ public static Process Start(ProcessStartInfo startInfo)
                                                             startInfo.FileName,
                                                             exception);
                         }
-                        
+
                         throw;
                     }
                 }
@@ -70,8 +70,14 @@ public static int Run(Action<string> output, Action<string> errorOutput, TextRea
             };
             foreach (var environmentalVariable in environmentalVariables)
             {
-                if (!psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value != null)
+                if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key))
+                {
+                    psi.EnvironmentVariables[environmentalVariable.Key] = environmentalVariable.Value;
+                }
+                else
+                {
                     psi.EnvironmentVariables.Add(environmentalVariable.Key, environmentalVariable.Value);
+                }
                 if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value == null)
                     psi.EnvironmentVariables.Remove(environmentalVariable.Key);
             }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static Process Start(ProcessStartInfo startInfo)`
`36`	`36`	`startInfo.FileName,`
`37`	`37`	`exception);`
`38`	`38`	`}`
`39`		`-`
	`39`	`+`
`40`	`40`	`throw;`
`41`	`41`	`}`
`42`	`42`	`}`
`@@ -70,8 +70,14 @@ public static int Run(Action<string> output, Action<string> errorOutput, TextRea`
`70`	`70`	`};`
`71`	`71`	`foreach (var environmentalVariable in environmentalVariables)`
`72`	`72`	`{`
`73`		`- if (!psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value != null)`
	`73`	`+ if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key))`
	`74`	`+ {`
	`75`	`+ psi.EnvironmentVariables[environmentalVariable.Key] = environmentalVariable.Value;`
	`76`	`+ }`
	`77`	`+ else`
	`78`	`+ {`
`74`	`79`	`psi.EnvironmentVariables.Add(environmentalVariable.Key, environmentalVariable.Value);`
	`80`	`+ }`
`75`	`81`	`if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value == null)`
`76`	`82`	`psi.EnvironmentVariables.Remove(environmentalVariable.Key);`
`77`	`83`	`}`