Title: [224765] trunk/Tools
- Revision
- 224765
- Author
- [email protected]
- Date
- 2017-11-13 11:55:17 -0800 (Mon, 13 Nov 2017)
Log Message
check-webkit-style cannot construct valid iOS version without an iOS SDK
https://bugs.webkit.org/show_bug.cgi?id=179616
<rdar://problem/35507018>
Reviewed by David Kilzer.
Instead of throwing an exception when we ask for an unavailable SDK on Mac,
we should return None.
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.xcode_sdk_version): Return 'None' version if the machine does not
have the requested SDK.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (224764 => 224765)
--- trunk/Tools/ChangeLog 2017-11-13 19:47:34 UTC (rev 224764)
+++ trunk/Tools/ChangeLog 2017-11-13 19:55:17 UTC (rev 224765)
@@ -1,3 +1,18 @@
+2017-11-13 Jonathan Bedard <[email protected]>
+
+ check-webkit-style cannot construct valid iOS version without an iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=179616
+ <rdar://problem/35507018>
+
+ Reviewed by David Kilzer.
+
+ Instead of throwing an exception when we ask for an unavailable SDK on Mac,
+ we should return None.
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo.xcode_sdk_version): Return 'None' version if the machine does not
+ have the requested SDK.
+
2017-11-13 Keith Miller <[email protected]>
Uninitialized variable in sort-Xcode-project-file
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (224764 => 224765)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2017-11-13 19:47:34 UTC (rev 224764)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2017-11-13 19:55:17 UTC (rev 224765)
@@ -128,7 +128,9 @@
def xcode_sdk_version(self, sdk_name):
if self.is_mac():
# Assumes that xcrun does not write to standard output on failure (e.g. SDK does not exist).
- return Version(self._executive.run_command(["xcrun", "--sdk", sdk_name, "--show-sdk-version"], return_stderr=False, error_handler=Executive.ignore_error).rstrip())
+ xcrun_output = self._executive.run_command(['xcrun', '--sdk', sdk_name, '--show-sdk-version'], return_stderr=False, error_handler=Executive.ignore_error).rstrip()
+ if xcrun_output:
+ return Version(xcrun_output)
return None
def xcode_simctl_list(self):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
