fixup!

buildbot/master/files/config/environments.py

@@ -48,6 +48,8 @@ def without(self, to_unset):
     'MSYS': 'winsymlinks=lnk',
     'MSYSTEM': 'MINGW64',
     'PATH': ';'.join([
+        r'C:\Python27',
+        r'C:\Python27\Scripts',
         r'C:\msys64\mingw64\bin',
         r'C:\msys64\usr\bin',
         r'C:\Windows\system32',

buildbot/master/files/config/factories.py

@@ -176,11 +176,9 @@ def make_step(self, command):
 
         command = command.split(' ')
 
-        # Add `bash -l -c` and export Windows Python before every command
-        # on Windows builders
-        bash_args = "export PATH=/c/python27:/c/python27/scripts:$PATH; "
-        command_win = ["bash", "-l", "-c", bash_args + " ".join(command)]
-        step_kwargs['command'] = command_win if self.is_windows else command
+        # Add `bash` before every command on Windows builders
+        bash_args = ["bash"] if self.is_windows else []
+        step_kwargs['command'] = bash_args + command
         if self.is_windows:
             step_env += envs.Environment({
                 # Set home directory, to avoid adding `cd` command every time