Changeset 139924 in webkit

Timestamp:

Jan 16, 2013 2:08:02 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

check-webkit-style script cannot running in Chinese windows.
​https://bugs.webkit.org/show_bug.cgi?id=87548

Patch by Xueqing Huang <​huangxueqing@baidu.com> on 2013-01-16
Reviewed by Darin Adler.

• Scripts/webkitpy/common/system/platforminfo.py:

(PlatformInfo._win_version_tuple_from_cmd):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-16  Xueqing Huang  <huangxueqing@baidu.com>
+
+        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  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py

@@ -156 +156 @@
     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