[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 e65b00626afbea2e49a144cecaad6c6a6abfe2ad
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 18:15:11 2010 +0000

    fix check_wdiff_install
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55161 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 47c8696..c6bff39 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-23  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix handling of check_wdiff_install when wdiff isn't installed.
+
+        http://bugs.webkit.org/show_bug.cgi?id=35304
+
+        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+
 2010-02-23  Leandro Pereira  <leandro at profusion.mobi>
 
         Reviewed by NOBODY.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
index 7e4f264..1001dcd 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
@@ -92,12 +92,14 @@ class ChromiumMacPort(chromium.ChromiumPort):
 
     def _check_wdiff_install(self):
         f = open(os.devnull, 'w')
-        rcode = subprocess.call(['wdiff'], stderr=f)
+        rcode = 0
+        try:
+            rcode = subprocess.call(['wdiff'], stderr=f)
+        except OSError:
+            logging.warning('wdiff not found. Install using MacPorts or some '
+                            'other means')
+            pass
         f.close()
-        if rcode == 127:
-            logging.error('wdiff not found. Install using MacPorts or some '
-                          'other means')
-            return False
         return True
 
     def _lighttpd_path(self, *comps):

-- 
WebKit Debian packaging