[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r71087:d707051da931
Date: 2014-04-30 15:02 +0200
http://bitbucket.org/pypy/pypy/changeset/d707051da931/

Log:	merge heads

diff --git a/pypy/tool/release/force-builds.py b/pypy/tool/release/force-builds.py
--- a/pypy/tool/release/force-builds.py
+++ b/pypy/tool/release/force-builds.py
@@ -41,10 +41,9 @@
         import pwd
         return pwd.getpwuid(os.getuid())[0]
 
-def main():
+def main(branch, server):
     #XXX: handle release tags
     #XXX: handle validity checks
-    branch = sys.argv[1]
     lock = defer.DeferredLock()
     requests = []
     def ebList(err):
@@ -54,10 +53,11 @@
 
     for builder in BUILDERS:
         print 'Forcing', builder, '...'
-        url = "http://buildbot.pypy.org/builders/" + builder + "/force"
+        url = "http://" + server + "/builders/" + builder + "/force"
         args = [
             ('username', get_user()),
             ('revision', ''),
+            ('forcescheduler', 'Force Scheduler'),
             ('submit', 'Force Build'),
             ('branch', branch),
             ('comments', "Forced by command line script")]
@@ -73,4 +73,11 @@
 
 if __name__ == '__main__':
     log.startLogging(sys.stdout)
-    main()
+    import optparse
+    parser = optparse.OptionParser()
+    parser.add_option("-b", "--branch", help="branch to build", default='')
+    parser.add_option("-s", "--server", help="buildbot server", default="buildbot.pypy.org")
+    (options, args) = parser.parse_args()
+    if  not options.branch:
+        parser.error("branch option required")
+    main(options.branch, options.server)