Title: [188270] trunk/Tools
- Revision
- 188270
- Author
- [email protected]
- Date
- 2015-08-11 12:15:43 -0700 (Tue, 11 Aug 2015)
Log Message
webkit-patch should not explode when $EDITOR is set incorrectly
https://bugs.webkit.org/show_bug.cgi?id=147884
Patch by Brian Burg <[email protected]> on 2015-08-11
Reviewed by Darin Adler.
If $EDITOR doesn't exist, log a warning and continue.
* Scripts/webkitpy/common/system/user.py:
(User.edit):
(User.edit_changelog):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (188269 => 188270)
--- trunk/Tools/ChangeLog 2015-08-11 19:11:55 UTC (rev 188269)
+++ trunk/Tools/ChangeLog 2015-08-11 19:15:43 UTC (rev 188270)
@@ -1,3 +1,16 @@
+2015-08-11 Brian Burg <[email protected]>
+
+ webkit-patch should not explode when $EDITOR is set incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=147884
+
+ Reviewed by Darin Adler.
+
+ If $EDITOR doesn't exist, log a warning and continue.
+
+ * Scripts/webkitpy/common/system/user.py:
+ (User.edit):
+ (User.edit_changelog):
+
2015-08-11 Dan Bernstein <[email protected]>
Reverted r188255, because it turned out that delegates do nonot need this information.
Modified: trunk/Tools/Scripts/webkitpy/common/system/user.py (188269 => 188270)
--- trunk/Tools/Scripts/webkitpy/common/system/user.py 2015-08-11 19:11:55 UTC (rev 188269)
+++ trunk/Tools/Scripts/webkitpy/common/system/user.py 2015-08-11 19:15:43 UTC (rev 188270)
@@ -126,7 +126,10 @@
editor = os.environ.get("EDITOR") or "vi"
args = shlex.split(editor)
# Note: Not thread safe: http://bugs.python.org/issue2320
- subprocess.call(args + files)
+ try:
+ subprocess.call(args + files)
+ except OSError, e:
+ _log.warn("There was a problem editing the ChangeLog using editor '%s': %s." % (editor, e))
def _warn_if_application_is_xcode(self, edit_application):
if "Xcode" in edit_application:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
