[Buildbot-commits] buildbot/buildbot/scripts runner.py,1.37,1.38
Brian Warner
warner at users.sourceforge.net
Mon Oct 24 21:39:54 UTC 2005
Update of /cvsroot/buildbot/buildbot/buildbot/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19252/buildbot/scripts
Modified Files:
runner.py
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-376
Creator: Brian Warner <warner at lothar.com>
improve VC handling of old buildslaves, sometimes refuse to build
* buildbot/process/step.py (CVS.startVC): refuse to build
update/copy -style builds on a non-default branch with an old
buildslave (<=0.6.6) that doesn't know how to do it properly. The
concern is that it will do a VC 'update' in an existing tree when
it is supposed to be switching branches (and therefore clobbering
the tree to do a full checkout), thus building the wrong source.
This used to be a warning, but I think the confusion it is likely
to cause warrants making it an error.
(SVN.startVC): same, also make mode=export on old slaves an error
(Darcs.startVC): same
(Git.startVC): improve error message for non-Git-enabled slaves
(Arch.checkSlaveVersion): same. continue to emit a warning when a
specific revision is built on a slave that doesn't pay attention
to args['revision'], because for slowly-changing trees it will
probably do the right thing, and because we have no way to tell
whether we're asking it to build the most recent version or not.
* buildbot/interfaces.py (BuildSlaveTooOldError): new exception
* buildbot/scripts/runner.py (SlaveOptions.postOptions): assert
that 'master' is in host:portnum format, to catch errors sooner
Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- runner.py 21 Oct 2005 08:03:39 -0000 1.37
+++ runner.py 24 Oct 2005 21:39:52 -0000 1.38
@@ -258,6 +258,8 @@
MakerBase.postOptions(self)
self['usepty'] = int(self['usepty'])
self['keepalive'] = int(self['keepalive'])
+ if self['master'].find(":") == -1:
+ raise usage.UsageError("--master must be in the form host:portnum")
slaveTAC = """
from twisted.application import service
More information about the Commits
mailing list