Ticket #226: nofailRestart.diff

old-upstream-buildbot-mirror/buildbot/interfaces.py

@@ -14 +14 @@
-class BuildSlaveTooOldError(Exception):
-    pass
-
+# other exceptions
+class BuildbotNotRunningError(Exception):
+    pass
+
-class IChangeSource(Interface):
-    """Object which feeds Change objects to the changemaster. When files or
-    directories are changed and the version control system provides some

old-upstream-buildbot-mirror/buildbot/scripts/runner.py

@@ -6 +6 @@
-import traceback
-from twisted.python import usage, util, runtime
-
+from buildbot.interfaces import BuildbotNotRunningError
+
-# this is mostly just a front-end for mktap, twistd, and kill(1), but in the
-# future it will also provide an interface to some developer tools that talk
-# directly to a remote buildmaster (like 'try' and a status client)
@@ -457 +459 @@
-    basedir = config['basedir']
-    quiet = config['quiet']
-    os.chdir(basedir)
-
+
+
+
+
-    pid = int(f.read().strip())
-    signum = getattr(signal, "SIG"+signame)
-    timer = 0
@@ -483 +488 @@
-def restart(config):
-    quiet = config['quiet']
-    from buildbot.scripts.startup import start
-
+
+
+
+
-    if not quiet:
-        print "now restarting buildbot process.."
-    start(config)