[Buildbot-commits] buildbot/buildbot master.py,1.70,1.71

[Brian Warner]

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

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

Merged from warner at monolith.lothar.com--2005 (patch 6)

Patches applied:

 * warner at monolith.lothar.com--2005/buildbot--dev--0--patch-6
   don't spawn twistd or /bin/kill in 'buildbot start/stop'


Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- master.py	6 May 2005 04:57:58 -0000	1.70
+++ master.py	6 May 2005 05:01:11 -0000	1.71
@@ -612,8 +612,8 @@
 
         self.bots = []
         # this ChangeMaster is a dummy, only used by tests. In the real
-        # buildmaster, where the BuildMaster instance is created by mktap,
-        # this attribute is not saved in the buildbot.tap file.
+        # buildmaster, where the BuildMaster instance is activated
+        # (startService is called) by twistd, this attribute is overwritten.
         self.useChanges(ChangeMaster())
 
         self.readConfig = False