[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1e8041648c6a24225d79826ce54a3ed234874c33
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 10:39:10 2009 +0000

    2009-12-15  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            bugzilla-tool/commit-queue needs to upload failure logs when patches are rejected
            https://bugs.webkit.org/show_bug.cgi?id=28286
    
            * QueueStatusServer/index.html:
             - Show [results] links if a results log was uploaded.
            * QueueStatusServer/queue_status.py:
             - Empty file uploads appear as u"" and Blob does not handle unicode, so convert to str().
            * Scripts/modules/commands/queues.py:
             - Post to the status bot when a patch fails and include the failure log as a results file.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9282cc0..28f8b49 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Adam Barth.
 
+        bugzilla-tool/commit-queue needs to upload failure logs when patches are rejected
+        https://bugs.webkit.org/show_bug.cgi?id=28286
+
+        * QueueStatusServer/index.html:
+         - Show [results] links if a results log was uploaded.
+        * QueueStatusServer/queue_status.py:
+         - Empty file uploads appear as u"" and Blob does not handle unicode, so convert to str().
+        * Scripts/modules/commands/queues.py:
+         - Post to the status bot when a patch fails and include the failure log as a results file.
+
+2009-12-15  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         queue sub-commands need --status-host so they can report status
         https://bugs.webkit.org/show_bug.cgi?id=32313
 
diff --git a/WebKitTools/QueueStatusServer/index.html b/WebKitTools/QueueStatusServer/index.html
index fbd51fb..00d0653 100644
--- a/WebKitTools/QueueStatusServer/index.html
+++ b/WebKitTools/QueueStatusServer/index.html
@@ -19,6 +19,11 @@
         <tr>
             <td class='status_date'>{{ recent_status.date|timesince }} ago</td>
             <td class="recent_status">{{ recent_status.message|force_escape|urlize|webkit_linkify|safe }}</td>
+            <td class="results_link">
+            {% if recent_status.results_file %}
+                [<a href="/results/{{ recent_status.key.id }}">results</a>]
+            {% endif %}
+            </td>
         </tr>
         {% endfor %}
     </table>
diff --git a/WebKitTools/QueueStatusServer/queue_status.py b/WebKitTools/QueueStatusServer/queue_status.py
index 65197bb..fc457ab 100644
--- a/WebKitTools/QueueStatusServer/queue_status.py
+++ b/WebKitTools/QueueStatusServer/queue_status.py
@@ -145,7 +145,7 @@ class UpdateStatus(webapp.RequestHandler):
         queue_status.active_patch_id = self._int_from_request('patch_id')
         queue_status.message = self.request.get('status')
         results_file = self.request.get("results_file")
-        queue_status.results_file = db.Blob(results_file)
+        queue_status.results_file = db.Blob(str(results_file))
         queue_status.put()
         self.redirect('/')
 
diff --git a/WebKitTools/Scripts/modules/commands/queues.py b/WebKitTools/Scripts/modules/commands/queues.py
index 1e4b331..c142769 100644
--- a/WebKitTools/Scripts/modules/commands/queues.py
+++ b/WebKitTools/Scripts/modules/commands/queues.py
@@ -147,7 +147,9 @@ class CommitQueue(AbstractQueue, StepSequenceErrorHandler):
 
     @classmethod
     def handle_script_error(cls, tool, state, script_error):
-        tool.bugs.reject_patch_from_commit_queue(state["patch"]["id"], script_error.message_with_output())
+        patch = state["patch"]
+        tool.status_bot.update_status(cls.name, "patch %s failed: %s" % (patch['id'], script_error.message), patch, StringIO(script_error.output))
+        tool.bugs.reject_patch_from_commit_queue(patch["id"], script_error.message_with_output())
 
 
 class AbstractReviewQueue(AbstractQueue, PersistentPatchCollectionDelegate, StepSequenceErrorHandler):

-- 
WebKit Debian packaging