[Buildbot-commits] buildbot/buildbot master.py,1.82,1.83

[Brian Warner]

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

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

fix some upgrade problems, fix the forgotten-builds problem

	* buildbot/status/builder.py (BuildStatus): derive from
	styles.Versioned, fix upgrade of .sourceStamp attribute. Also set
	the default (i.e. unknown) .slavename to "???" instead of None,
	since even unknown slavenames need to be printed eventually.
	(BuilderStatus): also derive from styles.Versioned . More
	importantly, determine .nextBuildNumber at creation/unpickling
	time by scanning the directory of saved BuildStatus instances and
	choosing one larger than the highest-numbered one found. This
	should fix the problem where random errors during upgrades cause
	the buildbot to forget about earlier builds. .nextBuildNumber is
	no longer stored in the pickle.
	(Status.builderAdded): if we can't unpickle the BuilderStatus,
	at least log the error. Also call Builder.determineNextBuildNumber
	once the basedir is set.

	* buildbot/master.py (BuildMaster.loadChanges): do
	styles.doUpgrade afterwards, in case I decide to make Changes
	derived from styles.Versioned some day and forget to make this
	change later.

--This line, and those below, will be ignored--
Files to commit:
   <can't compute list>

This list might be incomplete or outdated if editing the log
message was not invoked from an up-to-date changes buffer!


Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- master.py	14 Oct 2005 19:42:39 -0000	1.82
+++ master.py	23 Oct 2005 05:06:02 -0000	1.83
@@ -635,6 +635,7 @@
         filename = os.path.join(self.basedir, "changes.pck")
         try:
             changes = pickle.load(open(filename, "r"))
+            styles.doUpgrade()
         except IOError:
             log.msg("changes.pck missing, using new one")
             changes = ChangeMaster()