[pypy-commit] buildbot default: merge iko's fork for buildbot 0.8.3 compatibility

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r557:ed37082e4830
Date: 2011-08-06 17:46 +0200
http://bitbucket.org/pypy/buildbot/changeset/ed37082e4830/

Log:	merge iko's fork for buildbot 0.8.3 compatibility

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -57,6 +57,7 @@
             url,
             data[i:])
     return data
+
 _previous_body = StatusResourceBuilder.body
 if _previous_body.__name__ == 'body':
     StatusResourceBuilder.body = my_body
diff --git a/bot2/pypybuildbot/summary.py b/bot2/pypybuildbot/summary.py
--- a/bot2/pypybuildbot/summary.py
+++ b/bot2/pypybuildbot/summary.py
@@ -640,7 +640,7 @@
         i = rev.index(':')
         return (2, int(rev[:i]), rev)
     # unknown
-    return (3, rev)
+    return (0, rev)
 
 HEAD_ELEMENTS = [
     '<title>%(title)s</title>',
@@ -656,13 +656,18 @@
         self.categories = categories
         self.branch_order_prefixes = branch_order_prefixes
 
-    def content(self, request):
-        old_head_elements = request.site.buildbot_service.head_elements
+    def content(self, request, *args, **kw):
+        unset = old_head_elements = object()
+        try:
+            old_head_elements = request.site.buildbot_service.head_elements
+        except AttributeError:
+            pass
         self.head_elements = HEAD_ELEMENTS
         try:
-            return HtmlResource.content(self, request)
+            return HtmlResource.content(self, request, *args, **kw)
         finally:
-            request.site.buildbot_service.head_elements = old_head_elements
+            if old_head_elements is not unset:
+                request.site.buildbot_service.head_elements = old_head_elements
 
     def getTitle(self, request):
         status = self.getStatus(request)