Title: [222502] trunk/Tools
- Revision
- 222502
- Author
- [email protected]
- Date
- 2017-09-26 09:29:08 -0700 (Tue, 26 Sep 2017)
Log Message
[Win] 'webkit-patch clean' is failing on bot.
https://bugs.webkit.org/show_bug.cgi?id=177488
Reviewed by Brent Fulgham.
If 'os.remove' throws an exception, catch it.
* Scripts/webkitpy/common/checkout/scm/svn.py:
(SVN.discard_working_directory_changes):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (222501 => 222502)
--- trunk/Tools/ChangeLog 2017-09-26 15:51:55 UTC (rev 222501)
+++ trunk/Tools/ChangeLog 2017-09-26 16:29:08 UTC (rev 222502)
@@ -1,3 +1,15 @@
+2017-09-26 Per Arne Vollan <[email protected]>
+
+ [Win] 'webkit-patch clean' is failing on bot.
+ https://bugs.webkit.org/show_bug.cgi?id=177488
+
+ Reviewed by Brent Fulgham.
+
+ If 'os.remove' throws an exception, catch it.
+
+ * Scripts/webkitpy/common/checkout/scm/svn.py:
+ (SVN.discard_working_directory_changes):
+
2017-09-25 Frederik Riedel <[email protected]>
Expose way to set values of classified form controls as {Legacy WebKit, WebKit} SPI
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (222501 => 222502)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2017-09-26 15:51:55 UTC (rev 222501)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2017-09-26 16:29:08 UTC (rev 222502)
@@ -171,10 +171,13 @@
# This is robust against cwd != self.checkout_root
absolute_path = self.absolute_path(path)
# Completely lame that there is no easy way to remove both types with one call.
- if os.path.isdir(path):
- os.rmdir(absolute_path)
- else:
- os.remove(absolute_path)
+ try:
+ if os.path.isdir(path):
+ os.rmdir(absolute_path)
+ else:
+ os.remove(absolute_path)
+ except:
+ _log.warning('Could not delete: "%s".', absolute_path)
def status_command(self):
return [self.executable_name, 'status']
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
