[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2ec583c115203c780480761e48270ad8d9e947a7
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 11:10:38 2010 +0000

    2010-01-12  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.  Add "error" to the right part of the message.
    
            * Scripts/webkitpy/commands/queues.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 857a569..3d4e139 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-12  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed.  Add "error" to the right part of the message.
+
+        * Scripts/webkitpy/commands/queues.py:
+
+2010-01-12  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         EWS should show purple when svn-apply fails
diff --git a/WebKitTools/Scripts/webkitpy/commands/queues.py b/WebKitTools/Scripts/webkitpy/commands/queues.py
index 70646b8..1af6c13 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queues.py
@@ -125,10 +125,10 @@ class AbstractQueue(Command, QueueEngineDelegate):
 
     @classmethod
     def _update_status_for_script_error(cls, tool, state, script_error, is_error=False):
-        message = script_error.output
+        message = script_error.message
         if is_error:
             message = "Error: %s" % message
-        return tool.status_server.update_status(cls.name, script_error.message, state["patch"], StringIO(message))
+        return tool.status_server.update_status(cls.name, message, state["patch"], StringIO(script_error.output))
 
 
 class CommitQueue(AbstractQueue, StepSequenceErrorHandler):

-- 
WebKit Debian packaging