[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ukai at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit ce935b2ba57d7a61e45e9bc0c4ce8e159f0a37f8
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 04:36:51 2010 +0000

    2010-03-11  Fumitoshi Ukai  <ukai at chromium.org>
    
            Unreviewed.
    
            Fix typo in websocket_server.py
    
            * Scripts/webkitpy/layout_tests/port/websocket_server.py:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1f0d2dc..8378248 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-11  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Unreviewed.
+
+        Fix typo in websocket_server.py
+
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py:
+
 2010-03-11  Garret Kelly  <gdk at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
index d9d6baf..09c3659 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
@@ -186,8 +186,8 @@ class PyWebSocket(http_server.Lighttpd):
                 self._port_obj.path_from_chromium_base('third_party',
                                                        'cygwin', 'bin'),
                 env['PATH'])
-            env['CYGWIN_PATH'] = path_utils.path_from_base('third_party',
-                                                           'cygwin', 'bin')
+            env['CYGWIN_PATH'] = self._port_obj.path_from_base('third_party',
+                                                               'cygwin', 'bin')
 
         if sys.platform == 'win32' and self._register_cygwin:
             setup_mount = self._port_obj.path_from_chromium_base(

-- 
WebKit Debian packaging