Title: [174426] releases/WebKitGTK/webkit-2.6/Tools
- Revision
- 174426
- Author
- [email protected]
- Date
- 2014-10-08 03:22:22 -0700 (Wed, 08 Oct 2014)
Log Message
Merge r174309 - [GTK] generate-gtkdoc crashes when generating HTML due to encoding issues
https://bugs.webkit.org/show_bug.cgi?id=135502
Reviewed by Martin Robinson.
When writing to stdout/stderr fails due to a UnicodeDecodeError
exception, try again without encoding the output.
* gtk/gtkdoc.py:
(GTKDoc._run_command):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (174425 => 174426)
--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-08 10:19:47 UTC (rev 174425)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-08 10:22:22 UTC (rev 174426)
@@ -1,3 +1,16 @@
+2014-10-04 Carlos Garcia Campos <[email protected]>
+
+ [GTK] generate-gtkdoc crashes when generating HTML due to encoding issues
+ https://bugs.webkit.org/show_bug.cgi?id=135502
+
+ Reviewed by Martin Robinson.
+
+ When writing to stdout/stderr fails due to a UnicodeDecodeError
+ exception, try again without encoding the output.
+
+ * gtk/gtkdoc.py:
+ (GTKDoc._run_command):
+
2014-09-29 Carlos Alberto Lopez Perez <[email protected]>
[GTK] [EFL] Install TestNetscapePlugin apart from the other libs.
Modified: releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py (174425 => 174426)
--- releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py 2014-10-08 10:19:47 UTC (rev 174425)
+++ releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py 2014-10-08 10:22:22 UTC (rev 174426)
@@ -195,9 +195,15 @@
if print_output:
if stdout:
- sys.stdout.write(stdout.encode("utf-8"))
+ try:
+ sys.stdout.write(stdout.encode("utf-8"))
+ except UnicodeDecodeError:
+ sys.stdout.write(stdout)
if stderr:
- sys.stderr.write(stderr.encode("utf-8"))
+ try:
+ sys.stderr.write(stderr.encode("utf-8"))
+ except UnicodeDecodeError:
+ sys.stderr.write(stderr)
if process.returncode != 0:
raise Exception('%s produced a non-zero return code %i'
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
