[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
dglazkov at chromium.org
dglazkov at chromium.org
Wed Mar 17 18:02:31 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 97d5ba85556414ece157ed92d18948be16081776
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 26 18:37:41 2010 +0000
2010-02-26 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by David Levin.
new-webkit-run-tests: Extraneous parenthesis in websocket_server.py
https://bugs.webkit.org/show_bug.cgi?id=35436
* Scripts/webkitpy/layout_tests/port/websocket_server.py: Removed extra paren.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55292 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index af9d1f2..79443e7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-26 Dimitri Glazkov <dglazkov at chromium.org>
+
+ Reviewed by David Levin.
+
+ new-webkit-run-tests: Extraneous parenthesis in websocket_server.py
+ https://bugs.webkit.org/show_bug.cgi?id=35436
+
+ * Scripts/webkitpy/layout_tests/port/websocket_server.py: Removed extra paren.
+
2010-02-26 Chris Jerdonek <cjerdonek at webkit.org>
Reviewed by David Levin.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
index 430866b..0c4146e 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
@@ -151,7 +151,7 @@ class PyWebSocket(http_server.Lighttpd):
python_interp = sys.executable
pywebsocket_base = os.path.join(
os.path.dirname(os.path.dirname(os.path.dirname(
- os.path.abspath(__file__)))))), 'thirdparty', 'pywebsocket')
+ os.path.abspath(__file__)))), 'thirdparty', 'pywebsocket')
pywebsocket_script = os.path.join(pywebsocket_base, 'mod_pywebsocket',
'standalone.py')
start_cmd = [
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list