[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 317c513c7e8e18dd9b25fd691eaf3ee606668578
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 23:36:20 2009 +0000

    2009-11-27  Adam Barth  <abarth at 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: http://svn.webkit.org/repository/webkit/trunk@51449 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3b0cdb9..9b34fc7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,18 @@
 
         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 at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [bzt] Support --status-host in style-queue
         https://bugs.webkit.org/show_bug.cgi?id=31941
 
diff --git a/WebKitTools/Scripts/modules/commands/queues.py b/WebKitTools/Scripts/modules/commands/queues.py
index f5c57e5..918397f 100644
--- 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)
 
 

-- 
WebKit Debian packaging