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

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 422fc8d0016e32dcbb71d84bc0feb8e812c39923
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 22:58:51 2010 +0000

    2010-03-12  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Fix typo in websocket_server (path_from_base instead of
            path_from_chromium_base).
    
            https://bugs.webkit.org/show_bug.cgi?id=36074
    
            * Scripts/webkitpy/layout_tests/port/websocket_server.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1e9d206..be0f769 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,16 @@
 2010-03-12  Dirk Pranke  <dpranke at chromium.org>
 
+        Reviewed by Dimitri Glazkov.
+
+        Fix typo in websocket_server (path_from_base instead of 
+        path_from_chromium_base).
+
+        https://bugs.webkit.org/show_bug.cgi?id=36074
+
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py:
+
+2010-03-12  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Adam Barth.
 
         new-run-webkit-tests --new-baseline doesn't work at all.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
index 09c3659..1b1af71 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'] = self._port_obj.path_from_base('third_party',
-                                                               'cygwin', 'bin')
+            env['CYGWIN_PATH'] = self._port_obj.path_from_chromium_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