Title: [139924] trunk/Tools
- Revision
- 139924
- Author
- [email protected]
- Date
- 2013-01-16 14:08:02 -0800 (Wed, 16 Jan 2013)
Log Message
check-webkit-style script cannot running in Chinese windows.
https://bugs.webkit.org/show_bug.cgi?id=87548
Patch by Xueqing Huang <[email protected]> on 2013-01-16
Reviewed by Darin Adler.
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo._win_version_tuple_from_cmd):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139923 => 139924)
--- trunk/Tools/ChangeLog 2013-01-16 22:05:46 UTC (rev 139923)
+++ trunk/Tools/ChangeLog 2013-01-16 22:08:02 UTC (rev 139924)
@@ -1,3 +1,13 @@
+2013-01-16 Xueqing Huang <[email protected]>
+
+ check-webkit-style script cannot running in Chinese windows.
+ https://bugs.webkit.org/show_bug.cgi?id=87548
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo._win_version_tuple_from_cmd):
+
2013-01-16 Dirk Pranke <[email protected]>
Delete an extraneous print statement.
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (139923 => 139924)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2013-01-16 22:05:46 UTC (rev 139923)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2013-01-16 22:08:02 UTC (rev 139924)
@@ -155,7 +155,7 @@
def _win_version_tuple_from_cmd(self):
# Note that this should only ever be called on windows, so this should always work.
- ver_output = self._executive.run_command(['cmd', '/c', 'ver'])
+ ver_output = self._executive.run_command(['cmd', '/c', 'ver'], decode_output=False)
match_object = re.search(r'(?P<major>\d)\.(?P<minor>\d)\.(?P<build>\d+)', ver_output)
assert match_object, 'cmd returned an unexpected version string: ' + ver_output
return tuple(map(int, match_object.groups()))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
