Commit 897eea9d authored by zhaoyangli's avatar zhaoyangli Committed by Commit Bot

Accept Xcode GM license in build/mac_toolchain when missing version key.

Accept Xcode GM license as version from CIPD, instead of throwing a
KeyError when 'IDEXcodeVersionForAgreedToGMLicense' key doesn't exist
in '/Library/Preferences/com.apple.dt.Xcode.plist'.

Bug: 1131413
Change-Id: Ic383174232d02e37a53da20b74680609b2743ece
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432874Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811513}
parent 2a03afcf
......@@ -151,9 +151,10 @@ def InstallXcodeBinaries(version, binaries_root=None):
current_license_path = '/Library/Preferences/com.apple.dt.Xcode.plist'
if os.path.exists(current_license_path):
current_license_plist = plistlib.readPlist(current_license_path)
xcode_version = current_license_plist['IDEXcodeVersionForAgreedToGMLicense']
if (pkg_resources.parse_version(xcode_version) >=
pkg_resources.parse_version(cipd_xcode_version)):
xcode_version = current_license_plist.get(
'IDEXcodeVersionForAgreedToGMLicense')
if (xcode_version is not None and pkg_resources.parse_version(xcode_version)
>= pkg_resources.parse_version(cipd_xcode_version)):
should_overwrite_license = False
if not should_overwrite_license:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment