[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 2b54c4e9a6326aadc458f6dac8913490642f9cdb
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 01:48:16 2010 +0000

    2010-11-11  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            fix build breakage caused by fix for bug 49380 (r71858).
    
            config_standalone needs to ensure that the packages it needs are
            in sys.path.
    
            https://bugs.webkit.org/show_bug.cgi?id=49419
    
            * Scripts/webkitpy/layout_tests/port/config_standalone.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7c8c5da..3593c00 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,18 @@
 2010-11-11  Dirk Pranke  <dpranke at chromium.org>
 
+        Unreviewed, build fix.
+
+        fix build breakage caused by fix for bug 49380 (r71858).
+
+        config_standalone needs to ensure that the packages it needs are
+        in sys.path.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49419
+
+        * Scripts/webkitpy/layout_tests/port/config_standalone.py:
+
+2010-11-11  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Adam Roben.
 
         Fix NRWT to respect set-webkit-configuration again :(
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py
index 1fc81db..3dec3b9 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py
@@ -34,13 +34,21 @@ this test when we remove the global configuration cache in config.py."""
 
 import os
 import unittest
+import sys
+
+
+# Ensure that webkitpy is in PYTHONPATH.
+this_dir = os.path.abspath(sys.path[0])
+up = os.path.dirname
+script_dir = up(up(up(this_dir)))
+if script_dir not in sys.path:
+    sys.path.append(script_dir)
 
 from webkitpy.common.system import executive
 from webkitpy.common.system import executive_mock
 from webkitpy.common.system import filesystem
 from webkitpy.common.system import filesystem_mock
 
-import sys
 import config
 
 

-- 
WebKit Debian packaging