Avoid #12321 by creating environment before switching directories.

python/servo/devenv_commands.py

@@ -147,23 +147,24 @@ def grep(self, params):
              description='upgrade wptrunner.',
              category='devenv')
     def upgrade_wpt_runner(self):
+        env = self.build_env()
         with cd(path.join(self.context.topdir, 'tests', 'wpt', 'harness')):
-            code = call(["git", "init"], env=self.build_env())
+            code = call(["git", "init"], env=env)
             if code:
                 return code
             # No need to report an error if this fails, as it will for the first use
-            call(["git", "remote", "rm", "upstream"], env=self.build_env())
+            call(["git", "remote", "rm", "upstream"], env=env)
             code = call(
-                ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=self.build_env())
+                ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=env)
             if code:
                 return code
-            code = call(["git", "fetch", "upstream"], env=self.build_env())
+            code = call(["git", "fetch", "upstream"], env=env)
             if code:
                 return code
-            code = call(["git", "reset", "--hard", "remotes/upstream/master"], env=self.build_env())
+            code = call(["git", "reset", "--hard", "remotes/upstream/master"], env=env)
             if code:
                 return code
-            code = call(["rm", "-rf", ".git"], env=self.build_env())
+            code = call(["rm", "-rf", ".git"], env=env)
             if code:
                 return code
             return 0