[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 49e9e223bdf99dc6d170171e2b44939439929785
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 23:17:08 2010 +0000

    2010-03-01  Dirk Pranke  <dpranke at chromium.org>
    
            Rubber-stamped by Dimitri Glazkov.
    
            Fix breakage from r55372.
    
            https://bugs.webkit.org/show_bug.cgi?id=35549
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55382 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 88e4212..7781837 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-01  Dirk Pranke  <dpranke at chromium.org>
+
+        Rubber-stamped by Dimitri Glazkov.
+
+        Fix breakage from r55372.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35549
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-03-01  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index e06a255..8748c89 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -92,13 +92,14 @@ class ChromiumPort(base.Port):
         return result
 
     def check_sys_deps(self, needs_http):
+        test_shell_binary_path = self._path_to_driver()
         proc = subprocess.Popen([test_shell_binary_path,
                                 '--check-layout-test-sys-deps'])
         if proc.wait():
             logging.error('System dependencies check failed.')
             logging.error('To override, invoke with --nocheck-sys-deps')
             logging.error('')
-            result = False
+            return False
         return True
 
     def path_from_chromium_base(self, *comps):

-- 
WebKit Debian packaging