[Buildbot-commits] buildbot/buildbot master.py,1.69,1.70 plugins.tml,1.1,NONE bb_tap.py,1.4,NONE

[Brian Warner]

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

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

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

Stop using mktap, create buildbot.tac instead.

Patches applied:

 * warner at monolith.lothar.com--2005/buildbot--dev--0--patch-4
   stop using mktap, create buildbot.tac instead

 * warner at monolith.lothar.com--2005/buildbot--dev--0--patch-5
   remove more old mktap-related code


--- bb_tap.py DELETED ---

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- master.py	4 May 2005 06:44:30 -0000	1.69
+++ master.py	6 May 2005 04:57:58 -0000	1.70
@@ -524,11 +524,6 @@
     def upgradeToVersion2(self):
         self.names = {}
 
-    def __getstate__(self):
-        state = styles.Versioned.__getstate__(self)
-        state['names'] = {}
-        return state
-
     def register(self, name, afactory):
         self.names[name] = afactory
     def unregister(self, name):
@@ -623,15 +618,6 @@
 
         self.readConfig = False
 
-    def __getstate__(self):
-        state = service.MultiService.__getstate__(self)
-        state = styles.Versioned.__getstate__(self, state)
-        if state.has_key('change_svc'):
-            del state['change_svc']
-        state['services'] = []
-        state['namedServices'] = {}
-        return state
-
     def upgradeToVersion1(self):
         self.dispatcher = self.slaveFactory.root.portal.realm
 
@@ -1031,35 +1017,3 @@
 # so anybody who can get a handle on the BuildMaster can force a build with:
 #  IControl(master).getBuilder("full-2.3").forceBuild("me", "boredom")
 
-
-class Options(usage.Options):
-    synopsis = "Usage: mktap buildbot master --basedir <dir>"
-
-    longdesc = """
-    This command creates a buildmaster .tap file. The master will live in
-    <dir> and create various files there.
-
-    At runtime, the master will read a configuration file (named
-    'master.cfg' by default) in its basedir. This file should contain python
-    code which eventually defines a dictionary named 'BuildmasterConfig'.
-    The elements of this dictionary are used to configure the Buildmaster.
-    See doc/config.xhtml for details about what can be controlled through
-    this interface. """
-
-    optParameters = [
-        ["basedir", "d", None, "Base directory for the buildmaster"],
-        ["config", "c", "master.cfg", "configuration file name"],
-        ]
-
-    def abort(self):
-        print self
-        sys.exit(2)
-
-    def postOptions(self):
-        if self['basedir'] == None:
-            print " Must specify basedir with '--basedir DIR'"
-            print
-            self.abort()
-
-def makeService(config):
-    return BuildMaster(config['basedir'], config['config'])

--- plugins.tml DELETED ---