bug 413889 - change order of path for cygwin builds on qm-winxp01

tools/buildbot-configs/testing/unittest/master.cfg

@@ -194,6 +194,7 @@ osxFactory.addStep(MozillaClobber,
         env=MozillaEnvironments['osx'])
 osxFactory.addStep(MozillaCheckoutClientMk,
         workdir=".",
+        env=MozillaEnvironments['osx'],
         cvsroot=CVSROOT),
 osxFactory.addStep(FileDownload, mastersrc="mozconfig-osx", 
         slavedest=".mozconfig", 
@@ -261,6 +262,7 @@ leopardFactory.addStep(MozillaClobber,
         env=MozillaEnvironments['osx'])
 leopardFactory.addStep(MozillaCheckoutClientMk,
         workdir=".",
+        env=MozillaEnvironments['osx'],
         cvsroot=CVSROOT),
 leopardFactory.addStep(FileDownload, mastersrc="mozconfig-osx", 
         slavedest=".mozconfig", 

tools/buildbot-configs/testing/unittest/mozbuild.py

@@ -45,7 +45,6 @@ MozillaEnvironments['vc8'] = {
     "DevEnvDir": "C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE",
     "PATH": 'C:\\Python24;' + \
             'C:\\Python24\\Scripts;' + \
-            'C:\\cygwin\\bin;' + \
             'C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE;' + \
             'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\BIN;' + \
             'C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools;' + \
@@ -54,6 +53,7 @@ MozillaEnvironments['vc8'] = {
             'C:\\Program Files\\Microsoft Visual Studio 8\\SDK\\v2.0\\bin;' + \
             'C:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727;' + \
             'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\VCPackages;' + \
+            'C:\\cygwin\\bin;' + \
             'C:\\WINDOWS\\System32;' + \
             'C:\\WINDOWS;' + \
             'C:\\WINDOWS\System32\Wbem;' + \
@@ -202,7 +202,7 @@ class UpdateClobberFiles(ShellCommand):
         self.platform = kwargs['platform']
         if 'clobberFilePath' in kwargs:
             self.clobberFilePath = kwargs['clobberFilePath']
-       if 'logDir' in kwargs:
+        if 'logDir' in kwargs:
             self.logDir = kwargs['logDir']
         if self.platform.startswith('win'):
             self.tboxClobberModule = 'mozilla/tools/tinderbox-configs/firefox/win32'
@@ -235,7 +235,7 @@ class MozillaClobber(ShellCommand):
     def __init__(self, **kwargs):
         if 'platform' in kwargs:
             self.platform = kwargs['platform']
-       if 'logDir' in kwargs:
+        if 'logDir' in kwargs:
             self.logDir = kwargs['logDir']
         if 'clobberFilePath' in kwargs:
             self.clobberFilePath = kwargs['clobberFilePath']