[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 16001ecf92398bd3d57d420211cfef9c83d060ee
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 03:13:38 2010 +0000

    2010-09-21  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            new-run-webkit-tests: fix bug introduced in r68008 where if you
            specify --chromium and no --platform, and you're running on
            windows, you use the 'chromium-win' port by default instead of the
            version-specific port. This breaks the buildbots.
    
            It will be good for this refactoring to settle down so I can
            rewrite the logic for default ports and the unit tests to be
            clearer (and the testing more comprehensive).
    
            * Scripts/webkitpy/layout_tests/port/chromium_win.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e04f9bf..4362e25 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,20 @@
 2010-09-21  Dirk Pranke  <dpranke at chromium.org>
 
+        Unreviewed, build fix.
+
+        new-run-webkit-tests: fix bug introduced in r68008 where if you
+        specify --chromium and no --platform, and you're running on
+        windows, you use the 'chromium-win' port by default instead of the
+        version-specific port. This breaks the buildbots.
+
+        It will be good for this refactoring to settle down so I can
+        rewrite the logic for default ports and the unit tests to be
+        clearer (and the testing more comprehensive).
+
+        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+
+2010-09-21  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Adam Barth.
 
         Modify the Port interface to take only a series of keyword arguments
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py
index 333cfa4..d2b0265 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py
@@ -42,7 +42,7 @@ class ChromiumWinPort(chromium.ChromiumPort):
     """Chromium Win implementation of the Port class."""
 
     def __init__(self, **kwargs):
-        kwargs.setdefault('port_name', 'chromium-win')
+        kwargs.setdefault('port_name', 'chromium-win' + self.version())
         chromium.ChromiumPort.__init__(self, **kwargs)
 
     def setup_environ_for_server(self):

-- 
WebKit Debian packaging