[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[abarth at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 39ee7bf833bef0031f6ba81cbecc28dbead18c77
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 10:17:31 2010 +0000

    2010-01-12  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            EWS should show purple when svn-apply fails
            https://bugs.webkit.org/show_bug.cgi?id=33527
    
            * Scripts/webkitpy/commands/early_warning_system.py:
            * Scripts/webkitpy/commands/queues.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d6f18ae..857a569 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        EWS should show purple when svn-apply fails
+        https://bugs.webkit.org/show_bug.cgi?id=33527
+
+        * Scripts/webkitpy/commands/early_warning_system.py:
+        * Scripts/webkitpy/commands/queues.py:
+
+2010-01-12  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Remove copy/paste code from subclasses of AbstractReviewQueue
         https://bugs.webkit.org/show_bug.cgi?id=33525
 
diff --git a/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py b/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
index eb22533..631b411 100644
--- a/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
+++ b/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
@@ -33,6 +33,7 @@ from webkitpy.commands.queues import AbstractReviewQueue
 from webkitpy.committers import CommitterList
 from webkitpy.executive import ScriptError
 from webkitpy.webkitport import WebKitPort
+from webkitpy.queueengine import QueueEngine
 
 
 class AbstractEarlyWarningSystem(AbstractReviewQueue):
@@ -62,13 +63,14 @@ class AbstractEarlyWarningSystem(AbstractReviewQueue):
 
     @classmethod
     def handle_script_error(cls, tool, state, script_error):
-        status_id = cls._update_status_for_script_error(tool, state, script_error)
-        # FIXME: This won't be right for ports that don't use build-webkit!
-        if not script_error.command_name() == "build-webkit":
-            return
+        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)
         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)
+        exit(1)
 
 
 class GtkEWS(AbstractEarlyWarningSystem):
diff --git a/WebKitTools/Scripts/webkitpy/commands/queues.py b/WebKitTools/Scripts/webkitpy/commands/queues.py
index c2bdd36..70646b8 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queues.py
@@ -124,8 +124,11 @@ class AbstractQueue(Command, QueueEngineDelegate):
         return engine(self.name, self).run()
 
     @classmethod
-    def _update_status_for_script_error(cls, tool, state, script_error):
-        return tool.status_server.update_status(cls.name, script_error.message, state["patch"], StringIO(script_error.output))
+    def _update_status_for_script_error(cls, tool, state, script_error, is_error=False):
+        message = script_error.output
+        if is_error:
+            message = "Error: %s" % message
+        return tool.status_server.update_status(cls.name, script_error.message, state["patch"], StringIO(message))
 
 
 class CommitQueue(AbstractQueue, StepSequenceErrorHandler):
@@ -241,7 +244,8 @@ class AbstractReviewQueue(AbstractQueue, PersistentPatchCollectionDelegate, Step
             self._review_patch(patch)
             self._did_pass(patch)
         except ScriptError, e:
-            self._did_fail(patch)
+            if e.exit_code != QueueEngine.handled_error_code:
+                self._did_fail(patch)
             raise e
 
     def handle_unexpected_error(self, patch, message):
@@ -268,8 +272,10 @@ class StyleQueue(AbstractReviewQueue):
 
     @classmethod
     def handle_script_error(cls, tool, state, script_error):
-        status_id = cls._update_status_for_script_error(tool, state, script_error)
-        if not script_error.command_name() == "check-webkit-style":
-            return
+        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)
         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