Title: [136201] trunk/Tools
- Revision
- 136201
- Author
- [email protected]
- Date
- 2012-11-29 20:43:04 -0800 (Thu, 29 Nov 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (136200 => 136201)
--- trunk/Tools/ChangeLog 2012-11-30 04:41:25 UTC (rev 136200)
+++ trunk/Tools/ChangeLog 2012-11-30 04:43:04 UTC (rev 136201)
@@ -1,5 +1,21 @@
2012-11-29 Dirk Pranke <[email protected]>
+ 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 <[email protected]>
+
webkitpy: autoinstaller is failing on windows
https://bugs.webkit.org/show_bug.cgi?id=103699
Modified: trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py (136200 => 136201)
--- trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2012-11-30 04:41:25 UTC (rev 136200)
+++ trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2012-11-30 04:43:04 UTC (rev 136201)
@@ -337,7 +337,7 @@
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)
@@ -408,7 +408,7 @@
% (target_name, target_path, err))
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)
return True
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
