[Buildbot-commits] buildbot/buildbot/scripts runner.py,1.27,1.28

[Brian Warner]

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

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

fix HTMLLogFile upgrades, add basedir to sys.path in 'buildbot start'

	* buildbot/scripts/runner.py (start): put the basedir in sys.path
	before starting: this was done by twistd back when we spawned it,
	now that we're importing the pieces and running them in the
	current process, we have to do it ourselves. This allows
	master.cfg to import files from the same directory without
	explicitly manipulating PYTHONPATH. Thanks to Thomas Vander
	Stichele for the catch.

	* buildbot/status/builder.py (HTMLLogFile.upgrade): oops! second
	fix to make this behave like other LogFiles, this time to handle
	existing LogFiles on disk. (add the missing .upgrade method)
	* buildbot/test/test_status.py (Log.testHTMLUpgrade): test it


Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- runner.py	22 May 2005 01:44:19 -0000	1.27
+++ runner.py	23 May 2005 17:45:54 -0000	1.28
@@ -304,6 +304,7 @@
     basedir = config['basedir']
     quiet = config['quiet']
     os.chdir(basedir)
+    sys.path.insert(0, os.path.abspath(os.getcwd()))
     if os.path.exists("/usr/bin/make") and os.path.exists("Makefile.buildbot"):
         # Preferring the Makefile lets slave admins do useful things like set
         # up environment variables for the buildslave.