[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 2c61f3a66d24bd1b76c816612c1d77ee3b32b395
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 29 00:17:33 2009 +0000

    2009-11-28  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] style-queue should report style errors to bugzilla
            https://bugs.webkit.org/show_bug.cgi?id=31945
    
            Currently, we're just logging the style errors locally.  With this
            patch we'll actually log the errors to bugzilla.  Note: I plan to run
            with the "local-only" logging during development.
    
            * Scripts/modules/commands/queues.py:
            * Scripts/modules/scm.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51462 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3552a89..55d7d23 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Eric Seidel.
 
+        [bzt] style-queue should report style errors to bugzilla
+        https://bugs.webkit.org/show_bug.cgi?id=31945
+
+        Currently, we're just logging the style errors locally.  With this
+        patch we'll actually log the errors to bugzilla.  Note: I plan to run
+        with the "local-only" logging during development.
+
+        * Scripts/modules/commands/queues.py:
+        * Scripts/modules/scm.py:
+
+2009-11-28  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [bzt] style-queue shouldn't reject patches from the commit-queue
         https://bugs.webkit.org/show_bug.cgi?id=31944
 
diff --git a/WebKitTools/Scripts/modules/commands/queues.py b/WebKitTools/Scripts/modules/commands/queues.py
index f054091..014cd08 100644
--- a/WebKitTools/Scripts/modules/commands/queues.py
+++ b/WebKitTools/Scripts/modules/commands/queues.py
@@ -202,6 +202,19 @@ class StyleQueue(AbstractTryQueue):
         self.run_bugzilla_tool(["check-style", "--force-clean", "--non-interactive", "--parent-command=style-queue", patch["id"]])
         self._patches.done(patch)
 
+    @classmethod
+    def handle_script_error(cls, tool, patch, script_error):
+        command = script_error.script_args
+        if type(command) is list:
+            command = command[0]
+        # FIXME: We shouldn't need to use a regexp here.  ScriptError should
+        #        have a better API.
+        if re.search("check-webkit-style", command):
+            message = "Attachment %s did not pass %s:\n\n%s" % (patch["id"], cls.name, script_error.message_with_output(output_limit=None))
+            # Local-only logging helpful for development:
+            # log("** BEGIN BUG POST **\n%s** END BUG POST **" % message)
+            tool.bugs.post_comment_to_bug(patch["bug_id"], message)
+
 
 class BuildQueue(AbstractTryQueue):
     name = "build-queue"
diff --git a/WebKitTools/Scripts/modules/scm.py b/WebKitTools/Scripts/modules/scm.py
index d322762..beb32df 100644
--- a/WebKitTools/Scripts/modules/scm.py
+++ b/WebKitTools/Scripts/modules/scm.py
@@ -95,7 +95,7 @@ class ScriptError(Exception):
 
     def message_with_output(self, output_limit=500):
         if self.output:
-            if len(self.output) > output_limit:
+            if output_limit and len(self.output) > output_limit:
                  return "%s\nLast %s characters of output:\n%s" % (self, output_limit, self.output[-output_limit:])
             return "%s\n%s" % (self, self.output)
         return str(self)

-- 
WebKit Debian packaging