[pypy-commit] buildbot default: merge heads

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r651:1830be6aba5a
Date: 2012-07-13 11:06 +0200
http://bitbucket.org/pypy/buildbot/changeset/1830be6aba5a/

Log:	merge heads

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -8,6 +8,7 @@
 #from buildbot import manhole
 from pypybuildbot.pypylist import PyPyList, NumpyStatusList
 from pypybuildbot.ircbot import IRC # side effects
+from pypybuildbot.util import we_are_debugging
 
 # Forbid "force build" with empty user name
 from buildbot.status.web.builder import StatusResourceBuilder
@@ -20,7 +21,7 @@
     StatusResourceBuilder.force = my_force
 # Done
 
-if getpass.getuser() == 'antocuni':
+if we_are_debugging():
     channel = '#buildbot-test'
 else:
     channel = '#pypy'