[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3673b487a977ceeeb62933b5c6f219de591f16c3
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 7 05:20:13 2009 +0000

    2009-12-06  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Add early warning system commands to bugzilla-tool.
    
            * Scripts/bugzilla-tool:
            * Scripts/modules/landingsequence.py:
            * Scripts/modules/webkitport.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a01e756..d8e6d29 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        Add early warning system commands to bugzilla-tool.
+
+        * Scripts/bugzilla-tool:
+        * Scripts/modules/landingsequence.py:
+        * Scripts/modules/webkitport.py:
+
+2009-12-06  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [bzt] Implement Qt EarlyWarningSystem and Chromium EarlyWarningSystem
         https://bugs.webkit.org/show_bug.cgi?id=32205
 
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 764a138..e0f56cb 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -36,6 +36,7 @@ from modules.bugzilla import Bugzilla
 from modules.buildbot import BuildBot
 from modules.buildsteps import BuildSteps
 from modules.commands.download import *
+from modules.commands.early_warning_system import *
 from modules.commands.queries import *
 from modules.commands.queues import *
 from modules.commands.upload import *
diff --git a/WebKitTools/Scripts/modules/landingsequence.py b/WebKitTools/Scripts/modules/landingsequence.py
index b7bed2b..1f818c3 100644
--- a/WebKitTools/Scripts/modules/landingsequence.py
+++ b/WebKitTools/Scripts/modules/landingsequence.py
@@ -45,7 +45,7 @@ class LandingSequence:
         self._patch = patch
         self._options = options
         self._tool = tool
-        self._port = WebKitPort.port(self._options)
+        self._port = WebKitPort.port(self._options.port)
 
     def run(self):
         self.clean()
diff --git a/WebKitTools/Scripts/modules/webkitport.py b/WebKitTools/Scripts/modules/webkitport.py
index e769171..37dd41d 100644
--- a/WebKitTools/Scripts/modules/webkitport.py
+++ b/WebKitTools/Scripts/modules/webkitport.py
@@ -45,12 +45,12 @@ class WebKitPort():
         ]
 
     @staticmethod
-    def port(options):
-        if options.port == "mac":
+    def port(port_name):
+        if port_name == "mac":
             return MacPort
-        if options.port == "qt":
+        if port_name == "qt":
             return QtPort
-        if options.port == "chromium":
+        if port_name == "chromium":
             return ChromiumPort
         # FIXME: We should default to WinPort on Windows.
         return MacPort

-- 
WebKit Debian packaging