Title: [225215] trunk/Tools
- Revision
- 225215
- Author
- [email protected]
- Date
- 2017-11-28 06:43:31 -0800 (Tue, 28 Nov 2017)
Log Message
webkitpy: PlatformInfo raises AssertionError "assert self.os_version is not None" in Cygwin since Bug 179621
https://bugs.webkit.org/show_bug.cgi?id=180069
Patch by Fujii Hironori <[email protected]> on 2017-11-28
Reviewed by Daniel Bates.
"Version 10.0.16299" was interpreted as 0.0.16299. Fix the wrong
regexp for 'ver' command.
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo._win_version_from_cmd): Replace \d with \d+.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (225214 => 225215)
--- trunk/Tools/ChangeLog 2017-11-28 13:23:40 UTC (rev 225214)
+++ trunk/Tools/ChangeLog 2017-11-28 14:43:31 UTC (rev 225215)
@@ -1,3 +1,16 @@
+2017-11-28 Fujii Hironori <[email protected]>
+
+ webkitpy: PlatformInfo raises AssertionError "assert self.os_version is not None" in Cygwin since Bug 179621
+ https://bugs.webkit.org/show_bug.cgi?id=180069
+
+ Reviewed by Daniel Bates.
+
+ "Version 10.0.16299" was interpreted as 0.0.16299. Fix the wrong
+ regexp for 'ver' command.
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo._win_version_from_cmd): Replace \d with \d+.
+
2017-11-28 Carlos Garcia Campos <[email protected]>
[GTK] WebDriver: disable XSS auditor when running WebDriver tests
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (225214 => 225215)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2017-11-28 13:23:40 UTC (rev 225214)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2017-11-28 14:43:31 UTC (rev 225215)
@@ -184,6 +184,6 @@
def _win_version_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'], decode_output=False)
- match_object = re.search(r'(?P<major>\d)\.(?P<minor>\d)\.(?P<build>\d+)', ver_output)
+ 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 match_object.groups()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
