Changeset 136201 in webkit

Timestamp:

Nov 29, 2012, 8:43:04 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

Ignore errors when removing directories on win32 during autoinstall
​https://bugs.webkit.org/show_bug.cgi?id=103699

Unreviewed, build fix.

I think this will work on win32; if not, I'll have to actually
reproduce this :). The problem is that the logilab files
appear to contain a write-protected file, and deleting those
is problematic on windows.

• Scripts/webkitpy/common/system/autoinstall.py:

(AutoInstaller._install):
(AutoInstaller.install):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/autoinstall.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-29  Dirk Pranke  <dpranke@chromium.org>
+
+        Ignore errors when removing directories on win32 during autoinstall
+        https://bugs.webkit.org/show_bug.cgi?id=103699
+
+        Unreviewed, build fix.
+
+        I think this will work on win32; if not, I'll have to actually
+        reproduce this :). The problem is that the logilab files
+        appear to contain a write-protected file, and deleting those
+        is problematic on windows.
+
+        * Scripts/webkitpy/common/system/autoinstall.py:
+        (AutoInstaller._install):
+        (AutoInstaller.install):
+
 2012-11-29  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py

@@ -338 +338 @@
         if os.path.exists(target_path):
             if os.path.isdir(target_path):
-                shutil.rmtree(target_path)
+                shutil.rmtree(target_path, ignore_errors=True)
             else:
                 os.remove(target_path)
@@ -409 +409 @@
             raise Exception(message)
         finally:
-            shutil.rmtree(scratch_dir)
+            shutil.rmtree(scratch_dir, ignore_errors=True)
         _log.debug('Auto-installed %s to:' % url)
         _log.debug('    "%s"' % target_path)