[pypy-commit] buildbot 0.8.4-compat: buidslave compat for modern buildbot (via buildslave package)

RonnyPfannschmidt noreply at buildbot.pypy.org
Mon Aug 8 13:50:38 CEST 2011


Author: Ronny Pfannschmidt <Ronny.Pfannschmidt at gmx.de>
Branch: 0.8.4-compat
Changeset: r571:4100aa360e05
Date: 2011-08-08 13:49 +0200
http://bitbucket.org/pypy/buildbot/changeset/4100aa360e05/

Log:	buidslave compat for modern buildbot (via buildslave package)

diff --git a/slave/buildbot.tac b/slave/buildbot.tac
--- a/slave/buildbot.tac
+++ b/slave/buildbot.tac
@@ -1,6 +1,11 @@
 # -*- mode: python -*-
 from twisted.application import service
-from buildbot.slave.bot import BuildSlave
+try:
+    # 8.x
+    from buildslave.bot import BuildSlave
+except ImportError:
+    #7.x
+    from buildbot.slave.bot import BuildSlave
 
 # ---------------------------------------------------------------
 # manual editing of the automatically generated buildbot.tac


More information about the pypy-commit mailing list