[Buildbot-commits] buildbot/buildbot __init__.py,1.19,1.20 scheduler.py,1.10,1.11

Brian Warner warner at users.sourceforge.net
Sun Nov 27 03:58:50 UTC 2005


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

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

fix AnyBranchScheduler to handle branch==None, merge release--0.7.1

	* buildbot/scheduler.py (AnyBranchScheduler.addChange): don't
	explode when branch==None, thanks to Kevin Turner for the catch
	* buildbot/test/test_scheduler.py (Scheduling.testAnyBranch): test
	it

	* buildbot/__init__.py (version): bump to 0.7.1+ while between
	releases
	* docs/buildbot.texinfo: same


Index: __init__.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/__init__.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- __init__.py	27 Nov 2005 01:34:31 -0000	1.19
+++ __init__.py	27 Nov 2005 03:58:48 -0000	1.20
@@ -1,3 +1,3 @@
 #! /usr/bin/python
 
-version = "0.7.1"
+version = "0.7.1+"

Index: scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scheduler.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scheduler.py	26 Nov 2005 02:09:24 -0000	1.10
+++ scheduler.py	27 Nov 2005 03:58:48 -0000	1.11
@@ -255,7 +255,10 @@
             return
         s = self.schedulers.get(branch)
         if not s:
-            name = self.name + "." + branch
+            if branch:
+                name = self.name + "." + branch
+            else:
+                name = self.name + ".<default>"
             s = self.schedulerFactory(name, branch,
                                       self.treeStableTimer,
                                       self.builderNames,





More information about the Commits mailing list