Skip to content
Permalink
Browse files
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):

Canonical link: https://commits.webkit.org/125299@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139924 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Xueqing Huang authored and webkit-commit-queue committed Jan 16, 2013
1 parent e325635 commit f4d789e49ee80ce4eeaac5cdff44b0587fef58f2
Showing with 11 additions and 1 deletion.
  1. +10 −0 Tools/ChangeLog
  2. +1 −1 Tools/Scripts/webkitpy/common/system/platforminfo.py
@@ -1,3 +1,13 @@
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>

Delete an extraneous print statement.
@@ -155,7 +155,7 @@ def _win_version_tuple(self, sys_module):

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()))

0 comments on commit f4d789e

Please sign in to comment.