[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 6be7a292743c2fd91dba5318c558cda15e4e39df
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 11:21:43 2010 +0000

    2010-01-12  Adam Barth  <abarth at webkit.org>
    
            Unreviewed typo fix.  :(
    
            * Scripts/webkitpy/commands/early_warning_system.py:
            * Scripts/webkitpy/commands/queues.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53130 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3d4e139..b79fbb3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,12 @@
 2010-01-12  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed typo fix.  :(
+
+        * Scripts/webkitpy/commands/early_warning_system.py:
+        * Scripts/webkitpy/commands/queues.py:
+
+2010-01-12  Adam Barth  <abarth at webkit.org>
+
         Unreviewed.  Add "error" to the right part of the message.
 
         * Scripts/webkitpy/commands/queues.py:
diff --git a/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py b/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
index 631b411..287db57 100644
--- a/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
+++ b/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
@@ -66,7 +66,7 @@ class AbstractEarlyWarningSystem(AbstractReviewQueue):
         is_svn_apply = script_error.command_name() == "svn-apply"
         status_id = cls._update_status_for_script_error(tool, state, script_error, is_error=is_svn_apply)
         if is_svn_apply:
-            QueueEngine.exit_after_handled_error(e)
+            QueueEngine.exit_after_handled_error(script_error)
         results_link = tool.status_server.results_url_for_status(status_id)
         message = "Attachment %s did not build on %s:\nBuild output: %s" % (state["patch"]["id"], cls.port_name, results_link)
         tool.bugs.post_comment_to_bug(state["patch"]["bug_id"], message, cc=cls.watchers)
diff --git a/WebKitTools/Scripts/webkitpy/commands/queues.py b/WebKitTools/Scripts/webkitpy/commands/queues.py
index 1af6c13..105d5ce 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queues.py
@@ -275,7 +275,7 @@ class StyleQueue(AbstractReviewQueue):
         is_svn_apply = script_error.command_name() == "svn-apply"
         status_id = cls._update_status_for_script_error(tool, state, script_error, is_error=is_svn_apply)
         if is_svn_apply:
-            QueueEngine.exit_after_handled_error(e)
+            QueueEngine.exit_after_handled_error(script_error)
         message = "Attachment %s did not pass %s:\n\n%s" % (state["patch"]["id"], cls.name, script_error.message_with_output(output_limit=3*1024))
         tool.bugs.post_comment_to_bug(state["patch"]["bug_id"], message, cc=cls.watchers)
         exit(1)

-- 
WebKit Debian packaging