[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit e3e2d24485cd58bd67c138e51aec58e6b02e20b6
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 20:56:27 2010 +0000

    2010-12-09  Tony Chang  <tony at chromium.org>
    
            Unreviewed, fix for windows code.  We were catching the wrong
            exception in Windows.
    
            * Scripts/webkitpy/common/system/filesystem.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73638 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0f3356c..cf5546d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-09  Tony Chang  <tony at chromium.org>
+
+        Unreviewed, fix for windows code.  We were catching the wrong
+        exception in Windows.
+
+        * Scripts/webkitpy/common/system/filesystem.py:
+
 2010-12-09  Antonio Gomes  <agomes at rim.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKitTools/Scripts/webkitpy/common/system/filesystem.py b/WebKitTools/Scripts/webkitpy/common/system/filesystem.py
index a6ad425..d3143fd 100644
--- a/WebKitTools/Scripts/webkitpy/common/system/filesystem.py
+++ b/WebKitTools/Scripts/webkitpy/common/system/filesystem.py
@@ -110,9 +110,9 @@ class FileSystem(object):
         http://codesearch.google.com/codesearch/p?hl=en#OAMlx_jo-ck/src/base/test/test_file_util_win.cc&q=diefiledie&exact_package=chromium&l=22
         """
         try:
-            WindowsError
-        except NameError:
-            WindowsError = FileSystem._WindowsError
+            exceptions.WindowsError
+        except AttributeError:
+            exceptions.WindowsError = FileSystem._WindowsError
 
         retry_timeout_sec = 3.0
         sleep_interval = 0.1
@@ -120,7 +120,7 @@ class FileSystem(object):
             try:
                 osremove(path)
                 return True
-            except WindowsError, e:
+            except exceptions.WindowsError, e:
                 time.sleep(sleep_interval)
                 retry_timeout_sec -= sleep_interval
                 if retry_timeout_sec < 0:

-- 
WebKit Debian packaging