Title: [239939] trunk/Tools
- Revision
- 239939
- Author
- jbed...@apple.com
- Date
- 2019-01-14 13:32:49 -0800 (Mon, 14 Jan 2019)
Log Message
webkitpy: Support alternate simctl device list output (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=193362
<rdar://problem/47122965>
Rubber-stamped by Lucas Forschler.
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager.populate_available_devices):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (239938 => 239939)
--- trunk/Tools/ChangeLog 2019-01-14 21:27:59 UTC (rev 239938)
+++ trunk/Tools/ChangeLog 2019-01-14 21:32:49 UTC (rev 239939)
@@ -1,3 +1,14 @@
+2019-01-14 Jonathan Bedard <jbed...@apple.com>
+
+ webkitpy: Support alternate simctl device list output (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=193362
+ <rdar://problem/47122965>
+
+ Rubber-stamped by Lucas Forschler.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDeviceManager.populate_available_devices):
+
2019-01-14 Wenson Hsieh <wenson_hs...@apple.com>
[iOS] Expose SPI to access the current sentence boundary and selection state
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (239938 => 239939)
--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-01-14 21:27:59 UTC (rev 239938)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-01-14 21:32:49 UTC (rev 239939)
@@ -139,7 +139,7 @@
devices = devices_for_runtime['devices']
break
else:
- devices = simctl_json['devices'][runtime.name]
+ devices = simctl_json['devices'].get(runtime.name, None) or simctl_json['devices'].get(runtime.identifier, [])
for device_json in devices:
device = SimulatedDeviceManager._create_device_with_runtime(host, runtime, device_json)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
