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

tony at chromium.org tony at chromium.org
Wed Dec 22 14:15:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 82cf07cf5a3abaf705cb7a300b7e7ae7d3f00aae
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 22:55:56 2010 +0000

    2010-10-05  Tony Chang  <tony at chromium.org>
    
            Unreviewed, make shutil.rmtree more resiliant to errors
            since windows was raising WindowsError: The process cannot access the file because it
            is being used by another process.
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fffd53d..d6d5a1f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-05  Tony Chang  <tony at chromium.org>
 
+        Unreviewed, make shutil.rmtree more resiliant to errors
+        since windows was raising WindowsError: The process cannot access the file because it
+        is being used by another process.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
+2010-10-05  Tony Chang  <tony at chromium.org>
+
         Reviewed by Ojan Vafai.
 
         [chromium] fix image diffing in NRWT
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index d75cfb7..1802471 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -165,7 +165,7 @@ class ChromiumPort(base.Port):
             else:
                 raise e
         finally:
-            shutil.rmtree(tempdir)
+            shutil.rmtree(tempdir, ignore_errors=True)
         return result
 
     def driver_name(self):

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list