2009-11-27 Adam Barth <abarth@webkit.org>

        Reviewed by Eric Seidel.

        [bzt] style-queue fails to apply a bunch of patches for no reason
        https://bugs.webkit.org/show_bug.cgi?id=31942

        By passing --non-interactive to check-style, we convince check-style
        to pass --force to svn-apply, which lets it apply more patches.

        * Scripts/modules/commands/queues.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51449 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3b0cdb9c29b8e5ad91b2d67f0ca27ad803ca5a02..9b34fc760a86709b5ad2c53c5903f0ec082024a5 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] style-queue fails to apply a bunch of patches for no reason
+        https://bugs.webkit.org/show_bug.cgi?id=31942
+
+        By passing --non-interactive to check-style, we convince check-style
+        to pass --force to svn-apply, which lets it apply more patches.
+
+        * Scripts/modules/commands/queues.py:
+
 2009-11-27  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/WebKitTools/Scripts/modules/commands/queues.py b/WebKitTools/Scripts/modules/commands/queues.py
index f5c57e53650a106b1da44425f5ec932b17897003..918397fc573e2da6ca966c886b571558fb3a0c9f 100644 (file)
--- a/WebKitTools/Scripts/modules/commands/queues.py
+++ b/WebKitTools/Scripts/modules/commands/queues.py
@@ -185,7 +185,7 @@ class StyleQueue(AbstractTryQueue):
         return (True, "Checking style for patch %s on bug %s." % (patch["id"], patch["bug_id"]), patch)
 
     def process_work_item(self, patch):
-        self.run_bugzilla_tool(["check-style", "--force-clean", patch["id"]])
+        self.run_bugzilla_tool(["check-style", "--force-clean", "--non-interactive", patch["id"]])
         self._patches.done(patch)