Slave's ShellCommand and msys are broken. Upstream ticket #456
authorBen Hearsum <bhearsum@mozilla.com>
Wed, 29 Apr 2009 09:19:04 -0700
changeset 33 96306d3178825b08a4e158a67f13dbac7ec784ee
parent 32 110f30212f05f15f16db3c27bcae55269b8bd6dd
child 34 2159b801825b467d39652d9396fe2b89fb508708
push id7
push userbhearsum@mozilla.com
push dateWed, 29 Apr 2009 16:19:12 +0000
Slave's ShellCommand and msys are broken. Upstream ticket #456
buildbot/slave/commands.py
--- a/buildbot/slave/commands.py
+++ b/buildbot/slave/commands.py
@@ -400,17 +400,18 @@ class ShellCommand:
                 if '/c' not in argv: argv += ['/c'] 
                 argv += list(self.command)
             else:
                 argv = self.command
             display = " ".join(self.fake_command)
 
         # $PWD usually indicates the current directory; spawnProcess may not
         # update this value, though, so we set it explicitly here.
-        self.environ['PWD'] = os.path.abspath(self.workdir)
+        if not self.environ.get('MACHTYPE', None) == 'i686-pc-msys':
+            self.environ['PWD'] = os.path.abspath(self.workdir)
 
         # self.stdin is handled in ShellCommandPP.connectionMade
 
         # first header line is the command in plain text, argv joined with
         # spaces. You should be able to cut-and-paste this into a shell to
         # obtain the same results. If there are spaces in the arguments, too
         # bad.
         log.msg(" " + display)