[Buildbot-commits] buildbot/buildbot/process step_twisted.py,1.75,1.76

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23669/buildbot/process

Modified Files:
	step_twisted.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-530
Creator:  Brian Warner <warner at lothar.com>

step_twisted.py: fix another typo

	* buildbot/process/step_twisted.py (Trial.setupEnvironment): more
	bugs in twisted-specific code not covered by my unit tests, this
	time use 'cmd' argument instead of self.cmd


Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- step_twisted.py	24 Apr 2006 06:45:37 -0000	1.75
+++ step_twisted.py	7 May 2006 04:35:04 -0000	1.76
@@ -370,9 +370,9 @@
     def setupEnvironment(self, cmd):
         ShellCommand.setupEnvironment(self, cmd)
         if self.testpath != None:
-            e = self.cmd.args['env']
+            e = cmd.args['env']
             if e is None:
-                self.cmd.args['env'] = {'PYTHONPATH': self.testpath}
+                cmd.args['env'] = {'PYTHONPATH': self.testpath}
             else:
                 # TODO: somehow, each build causes another copy of
                 # self.testpath to get prepended
@@ -381,7 +381,7 @@
                 else:
                     e['PYTHONPATH'] = self.testpath + ":" + e['PYTHONPATH']
         try:
-            p = self.cmd.args['env']['PYTHONPATH']
+            p = cmd.args['env']['PYTHONPATH']
             if type(p) is not str:
                 log.msg("hey, not a string:", p)
                 assert False