[pypy-commit] buildbot default: check in the changes applied locally on baroquesoftware.com

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r987:f460098a5737
Date: 2016-02-10 15:08 +0100
http://bitbucket.org/pypy/buildbot/changeset/f460098a5737/

Log:	check in the changes applied locally on baroquesoftware.com

diff --git a/README b/README
--- a/README
+++ b/README
@@ -50,6 +50,10 @@
 
 $ buildbot start
 
+OR
+
+$ ./restart_buildmaster_when_not_running
+
 To run a buildslave
 ===================
 Please refer to README_BUILDSLAVE
diff --git a/bbhook/irc.py b/bbhook/irc.py
--- a/bbhook/irc.py
+++ b/bbhook/irc.py
@@ -44,11 +44,13 @@
         print message + '\n'
     else:
         from .main import app
-        return subprocess.call([
+        args = [
             app.config['BOT'],
             app.config['CHANNEL'],
             message,
-        ])
+        ]
+        print args
+        return subprocess.call(args)
 
 def get_short_id(owner, repo, branch):
     """
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -484,7 +484,7 @@
                    "category": 'mac32'
                   },
                   {"name" : JITMACOSX64,
-                   "slavenames": ["rebuy-de", "xerxes", "tosh", "osx-10.9-x64-dw"],
+                   "slavenames": ["rebuy-de", "tosh", "osx-10.9-x64-dw"],  # "xerxes"
                    'builddir' : JITMACOSX64,
                    'factory' : pypyJITTranslatedTestFactoryOSX64,
                    'category' : 'mac64',
diff --git a/bot2/pypybuildbot/util.py b/bot2/pypybuildbot/util.py
--- a/bot2/pypybuildbot/util.py
+++ b/bot2/pypybuildbot/util.py
@@ -2,7 +2,7 @@
 import socket
 
 def we_are_debugging():
-    return socket.gethostname() != 'cobra'
+    return socket.gethostname() != 'baroquesoftware'
 
 def load(name):
     mod = __import__(name, {}, {}, ['__all__'])