216903 2020-09-23 15:47:35 -0700 webkitpy: Make sw_vers the source of truth for the MacOS version 2020-09-23 16:28:56 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu ews-watchlist glenn webkit-bug-importer oldest_to_newest 1691285 0 jbedard 2020-09-23 15:47:35 -0700 For compatibility reasons, platform.mac_ver() may return 10.16 instead of 11.0. In WebKit, we always want the actual macOS version, and should prefer the version as reported by sw_vers. 1691286 1 webkit-bug-importer 2020-09-23 15:47:49 -0700 <rdar://problem/69462735> 1691290 2 409508 jbedard 2020-09-23 15:52:08 -0700 Created attachment 409508 Patch 1691314 3 ews-feeder 2020-09-23 16:28:55 -0700 Committed r267508: <https://trac.webkit.org/changeset/267508> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409508. 409508 2020-09-23 15:52:08 -0700 2020-09-23 16:28:55 -0700 Patch bug-216903-20200923155207.patch text/plain 2208 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NzUwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTA5LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogTWFrZSBzd192ZXJzIHRoZSBzb3VyY2Ugb2YgdHJ1dGgg Zm9yIHRoZSBNYWNPUyB2ZXJzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTY5MDMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5NDYyNzM1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weToKKyAgICAgICAgKFBsYXRm b3JtSW5mby5fX2luaXRfXyk6IFVzZSBzd192ZXJzIGluc3RlYWQgb2YgcGxhdGZvcm0ubWFjX3Zl cigpLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWlu Zm9fdW5pdHRlc3QucHk6CisgICAgICAgIChmYWtlX2V4ZWN1dGl2ZSk6IFNldCBhIHZhbGlkIHJl dHVybiB2YWx1ZSBmb3Igc3dfdmVycyBieSBkZWZhdWx0LgorCiAyMDIwLTA5LTIzICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVd IE1vdmUgVExTIGVycm9ycyBBUEkgZnJvbSBXZWJLaXRDb250ZXh0IHRvIFdlYktpdFdlYnNpdGVE YXRhTWFuYWdlcgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Bs YXRmb3JtaW5mby5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CShyZXZpc2lvbiAyNjc1MDMpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CSh3b3JraW5nIGNvcHkp CkBAIC02Nyw3ICs2Nyw3IEBAIGNsYXNzIFBsYXRmb3JtSW5mbyhvYmplY3QpOgogICAgICAgICBz ZWxmLl9pc19jeWd3aW4gPSBzeXNfbW9kdWxlLnBsYXRmb3JtID09ICdjeWd3aW4nCiAKICAgICAg ICAgaWYgc2VsZi5vc19uYW1lLnN0YXJ0c3dpdGgoJ21hYycpOgotICAgICAgICAgICAgc2VsZi5v c192ZXJzaW9uID0gVmVyc2lvbi5mcm9tX3N0cmluZyhwbGF0Zm9ybV9tb2R1bGUubWFjX3Zlcigp WzBdKQorICAgICAgICAgICAgc2VsZi5vc192ZXJzaW9uID0gVmVyc2lvbi5mcm9tX3N0cmluZyhz ZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWydzd192ZXJzJywgJy1wcm9kdWN0VmVyc2lvbidd KS5yc3RyaXAoKSkKICAgICAgICAgZWxpZiBzZWxmLm9zX25hbWUuc3RhcnRzd2l0aCgnd2luJyk6 CiAgICAgICAgICAgICBzZWxmLm9zX3ZlcnNpb24gPSBzZWxmLl93aW5fdmVyc2lvbigpCiAgICAg ICAgIGVsc2U6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxh dGZvcm1pbmZvX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2NzUw MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9f dW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0LDcgQEAgZGVmIGZha2VfcGxh dGZvcm0obWFjX3ZlcnNpb25fc3RyaW5nPScxMAogZGVmIGZha2VfZXhlY3V0aXZlKG91dHB1dD1O b25lKToKICAgICBpZiBvdXRwdXQ6CiAgICAgICAgIHJldHVybiBNb2NrRXhlY3V0aXZlMihvdXRw dXQ9b3V0cHV0KQotICAgIHJldHVybiBNb2NrRXhlY3V0aXZlMihleGNlcHRpb249U3lzdGVtRXJy b3IpCisgICAgcmV0dXJuIE1vY2tFeGVjdXRpdmUyKG91dHB1dD0nMTAuMTUuMFxuJykKIAogCiBj bGFzcyBUZXN0UGxhdGZvcm1JbmZvKHVuaXR0ZXN0LlRlc3RDYXNlKToK