[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4bbec3be79d15bffa900eb41ba1d2e63efd04d07
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 01:29:45 2010 +0000

    2010-03-01  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by nobody. Build bustage :(
    
            Fix stupid typo that I committed even after David Levin pointed
            it out to me :(
    
            https://bugs.webkit.org/show_bug.cgi?id=35553
    
            * Scripts/webkitpy/layout_tests/port/mac.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55391 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4fa06b4..ce21a62 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-01  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by nobody. Build bustage :(
+
+        Fix stupid typo that I committed even after David Levin pointed
+        it out to me :(
+
+        https://bugs.webkit.org/show_bug.cgi?id=35553
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+
 2010-03-01  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
index 96ea00c..e55a78d 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
@@ -445,7 +445,7 @@ class MacDriver(base.Driver):
                     null = open(os.devnull, "w")
                     subprocess.Popen(["kill", "-9",
                                      str(self._proc.pid)], stderr=null)
-                    null.close()                not self._proc.poll()):
+                    null.close()
 
     def _read_line(self, timeout, stop_time, image_length=0):
         now = time.time()

-- 
WebKit Debian packaging