Merge branch 'stable'

* stable: (GH-439) update environment before setting custom
chocolatey · Jun 12, 2016 · e1b999e · e1b999e
2 parents 2ab2146 + ebca582
commit e1b999e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/chocolatey/infrastructure.app/services/PowershellService.cs b/src/chocolatey/infrastructure.app/services/PowershellService.cs
@@ -374,8 +374,8 @@ public void prepare_powershell_environment(IPackage package, ChocolateyConfigura
         {
             if (package == null) return;
 
-            EnvironmentSettings.set_environment_variables(configuration);
             EnvironmentSettings.update_environment_variables();
+            EnvironmentSettings.set_environment_variables(configuration);
 
             Environment.SetEnvironmentVariable("chocolateyPackageName", package.Id);
             Environment.SetEnvironmentVariable("packageName", package.Id);