[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 a215d720446add3e8d48ca8fdae7b7b98113b240
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 20 19:31:39 2009 +0000

    2009-11-20  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Support Qt port in build-queue
            https://bugs.webkit.org/show_bug.cgi?id=31733
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51249 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index dafa75e..71cd28c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Eric Seidel.
 
+        Support Qt port in build-queue
+        https://bugs.webkit.org/show_bug.cgi?id=31733
+
+        * Scripts/bugzilla-tool:
+
+2009-11-20  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Implement a build-queue
         https://bugs.webkit.org/show_bug.cgi?id=31725
 
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 529af8f..a02258d 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -632,8 +632,8 @@ class TreeStatus(Command):
 
 
 class AbstractQueue(Command, WorkQueueDelegate):
-    def __init__(self):
-        options = [
+    def __init__(self, options=[]):
+        options += [
             make_option("--no-confirm", action="store_false", dest="confirm", default=True, help="Do not ask the user for confirmation before running the queue.  Dangerous!"),
             make_option("--status-host", action="store", type="string", dest="status_host", default=StatusBot.default_host, help="Hostname (e.g. localhost or commit.webkit.org) where status updates should be posted."),
         ]
@@ -718,8 +718,8 @@ class CommitQueue(AbstractQueue):
 
 
 class AbstractTryQueue(AbstractQueue):
-    def __init__(self):
-        AbstractQueue.__init__(self)
+    def __init__(self, options=[]):
+        AbstractQueue.__init__(self, options)
 
     def status_host(self):
         return None # FIXME: A hack until we come up with a more generic status page.
@@ -758,7 +758,8 @@ class StyleQueue(AbstractTryQueue):
 class BuildQueue(AbstractTryQueue):
     name = "build-queue"
     def __init__(self):
-        AbstractTryQueue.__init__(self)
+        options = WebKitPort.port_options()
+        AbstractTryQueue.__init__(self, options)
 
     def should_proceed_with_work_item(self, patch):
         # FIXME: We should check whether we're currently able to build!

-- 
WebKit Debian packaging