231843 2021-10-15 16:11:31 -0700 [webkitscmpy] Filter approvers by status 2021-10-19 12:39:35 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu webkit-bug-importer oldest_to_newest 1805101 0 jbedard 2021-10-15 16:11:31 -0700 We should only list approvers that are reviewers, if a project even defines such a status. 1805102 1 webkit-bug-importer 2021-10-15 16:11:47 -0700 <rdar://problem/84320934> 1805118 2 441452 jbedard 2021-10-15 16:30:29 -0700 Created attachment 441452 Patch 1805120 3 jbedard 2021-10-15 16:31:56 -0700 https://github.com/WebKit/WebKit/pull/17 1806177 4 441761 jbedard 2021-10-19 11:23:36 -0700 Created attachment 441761 Patch for landing 1806178 5 ews-feeder 2021-10-19 11:24:49 -0700 ChangeLog entry in Tools/ChangeLog contains OOPS!. 1806180 6 441762 jbedard 2021-10-19 11:26:12 -0700 Created attachment 441762 Patch for landing 1806234 7 ews-feeder 2021-10-19 12:39:34 -0700 Committed r284479 (243238@main): <https://commits.webkit.org/243238@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441762. 441452 2021-10-15 16:30:29 -0700 2021-10-19 11:23:33 -0700 Patch bug-231843-20211015163029.patch text/plain 9319 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Mjg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzRiYmFmYjI3MWFlZTQyYjBhYWNhZDExNTlkOTYwZjU5 MDM0M2E4Zi4uY2M3NDk3NzA5MzM2NDlmNDQ3YTdhYWEyN2JjMDdlYjViNDE1MWZjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTEwLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEZpbHRlciBhcHByb3ZlcnMgYnkgc3RhdHVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE4NDMKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzg0MzIwOTM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIElmIGEgcHJvamVjdCBkZWZpbmVzIHN0YXR1c2VzIGZvciBpdCdz IGNvbnRyaWJ1dG9ycywgd2Ugb25seSB3YW50CisgICAgICAgIHRvIGFsbG93IHJldmlld2VycyB0 byBhcHByb3ZlIGNoYW5nZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weToKKyAgICAgICAgKENvbnRyaWJ1dG9yKTog QWRkIHJldmlld2VyIHN0YXR1cy4KKyAgICAgICAgKENvbnRyaWJ1dG9yLk1hcHBpbmcubG9hZCk6 IEtlZXAgdHJhY2sgb2YgcG9zc2libGUgc3RhdHVzZXMuCisgICAgICAgIChDb250cmlidXRvci5N YXBwaW5nLl9faW5pdF9fKTogRGl0dG8uCisgICAgICAgIChDb250cmlidXRvci5NYXBwaW5nLmFk ZCk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHk6CisgICAgICAgIChCaXRCdWNrZXQuUFJHZW5lcmF0 b3IuUHVsbFJlcXVlc3QpOiBJZiBhIHByb2plY3QgZGVmaW5lcyBhIHJldmlld2VyIHN0YXR1cywg ZW5mb3JjZSBpdC4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weToKKyAgICAgICAgKEdpdEh1Yi5QUkdlbmVyYXRvci5f Y29udHJpYnV0b3IpOiBIYW5kbGUgY2FzZSB3aGVyZSBubyBuYW1lIGlzIGRlZmluZWQuCisgICAg ICAgIChHaXRIdWIuUFJHZW5lcmF0b3IucmV2aWV3ZXJzKTogSWYgYSBwcm9qZWN0IGRlZmluZXMg YSByZXZpZXdlciBzdGF0dXMsIGVuZm9yY2UgaXQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHk6 CisKIDIwMjEtMTAtMTUgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAg ICAgICAgIFt3ZWJraXRzY21weV0gQWxsb3cgcmVwb3NpdG9yaWVzIHRvIGRlZmluZSBjdXN0b20g c2V0dXAgY29tbWFuZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkKaW5kZXggNDUyY2Y3OGQy MDQxOGQ2ZjM5NmU0YjNhNzAzMjdlZjRiNWVlYzhkOS4uYWM1ZmI4NDBmMGQ4MjQwZjdmMmU3MTQ5 OGFlODhhZGViYzVkODdjNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkKQEAgLTM1LDYg KzM1LDcgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICBTVk5fQVVUSE9SX1JFID0g cmUuY29tcGlsZShyJ3IoP1A8cmV2aXNpb24+XGQrKSBcfCAoP1A8ZW1haWw+LiopIFx8ICg/UDxk YXRlPi4qKSBcfCBcZCsgbGluZXM/JykKICAgICBTVk5fQVVUSE9SX1FfUkUgPSByZS5jb21waWxl KHIncig/UDxyZXZpc2lvbj5cZCspIFx8ICg/UDxlbWFpbD4uKikgXHwgKD9QPGRhdGU+LiopJykK ICAgICBTVk5fUEFUQ0hfRlJPTV9SRSA9IHJlLmNvbXBpbGUocidQYXRjaCBieSAoP1A8YXV0aG9y Pi4qKSA8KD9QPGVtYWlsPi4qKT4gb24gXGQrLVxkKy1cZCsnKQorICAgIFJFVklFV0VSID0gJ3Jl dmlld2VyJwogCiAgICAgY2xhc3MgRW5jb2Rlcihqc29uLkpTT05FbmNvZGVyKToKIApAQCAtNjgs NiArNjksOCBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAgICAgIGNy ZWF0ZWQuZ2l0aHViID0gY29udHJpYnV0b3IuZ2V0KCdnaXRodWInLCBjcmVhdGVkLmdpdGh1YikK ICAgICAgICAgICAgICAgICBjcmVhdGVkLmJpdGJ1Y2tldCA9IGNvbnRyaWJ1dG9yLmdldCgnYml0 YnVja2V0JywgY3JlYXRlZC5iaXRidWNrZXQpCiAKKyAgICAgICAgICAgICAgICByZXN1bHQuc3Rh dHVzZXMuYWRkKGNyZWF0ZWQuc3RhdHVzKQorCiAgICAgICAgICAgICAgICAgaWYgY3JlYXRlZC5n aXRodWI6CiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdFtjcmVhdGVkLmdpdGh1Yl0gPSBjcmVh dGVkCiAgICAgICAgICAgICAgICAgaWYgY3JlYXRlZC5iaXRidWNrZXQ6CkBAIC04NSw2ICs4OCw3 IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAKICAgICAgICAgZGVmIF9faW5pdF9fKHNl bGYpOgogICAgICAgICAgICAgc3VwZXIoQ29udHJpYnV0b3IuTWFwcGluZywgc2VsZikuX19pbml0 X18obGFtYmRhOiBOb25lKQorICAgICAgICAgICAgc2VsZi5zdGF0dXNlcyA9IHNldCgpCiAKICAg ICAgICAgZGVmIHNhdmUoc2VsZiwgZmlsZSk6CiAgICAgICAgICAgICBhbGlhc190b19uYW1lID0g ZGVmYXVsdGRpY3QobGlzdCkKQEAgLTExMSw2ICsxMTUsOCBAQCBjbGFzcyBDb250cmlidXRvcihv YmplY3QpOgogICAgICAgICAgICAgcmVzdWx0LmdpdGh1YiA9IGNvbnRyaWJ1dG9yLmdpdGh1YiBv ciByZXN1bHQuZ2l0aHViCiAgICAgICAgICAgICByZXN1bHQuYml0YnVja2V0ID0gY29udHJpYnV0 b3IuYml0YnVja2V0IG9yIHJlc3VsdC5iaXRidWNrZXQKIAorICAgICAgICAgICAgc2VsZi5zdGF0 dXNlcy5hZGQocmVzdWx0LnN0YXR1cykKKwogICAgICAgICAgICAgaWYgcmVzdWx0LmdpdGh1YjoK ICAgICAgICAgICAgICAgICBzZWxmW3Jlc3VsdC5naXRodWJdID0gcmVzdWx0CiAgICAgICAgICAg ICBpZiByZXN1bHQuYml0YnVja2V0OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5weSBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9iaXRidWNrZXQu cHkKaW5kZXggOTY2ZmVkZTViODc3M2Y5NzhlMDgzZGM4MzY2OGM5NWViMDU5ZjQ0Ny4uMmY1MGY2 YjcxMDVkODBmMTA1NzgwZWMzODEwZGM4OTNmMjYwYzM5NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9y ZW1vdGUvYml0YnVja2V0LnB5CkBAIC0yNSwxMCArMjUsOCBAQCBpbXBvcnQgcmVxdWVzdHMKIGlt cG9ydCBzaXgKIGltcG9ydCBzeXMKIAotaW1wb3J0IGpzb24KLQogZnJvbSB3ZWJraXRjb3JlcHkg aW1wb3J0IGRlY29yYXRvcnMKLWZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgUHVsbFJl cXVlc3QKK2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgQ29udHJpYnV0b3IsIFB1bGxS ZXF1ZXN0CiBmcm9tIHdlYmtpdHNjbXB5LnJlbW90ZS5zY20gaW1wb3J0IFNjbQogCiAKQEAgLTU4 LDEzICs1NiwxNCBAQCBjbGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICAgICAgICAgIHJlc3VsdC5f cmV2aWV3ZXJzID0gW10KICAgICAgICAgICAgIHJlc3VsdC5fYXBwcm92ZXJzID0gW10KICAgICAg ICAgICAgIHJlc3VsdC5fYmxvY2tlcnMgPSBbXQorICAgICAgICAgICAgbmVlZHNfc3RhdHVzID0g Q29udHJpYnV0b3IuUkVWSUVXRVIgaW4gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5zdGF0 dXNlcwogICAgICAgICAgICAgZm9yIHJkYXRhIGluIGRhdGEuZ2V0KCdyZXZpZXdlcnMnLCBbXSk6 CiAgICAgICAgICAgICAgICAgcmV2aWV3ZXIgPSBzZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3Jz LmNyZWF0ZSgKICAgICAgICAgICAgICAgICAgICAgcmRhdGFbJ3VzZXInXVsnZGlzcGxheU5hbWUn XSwKICAgICAgICAgICAgICAgICAgICAgcmRhdGFbJ3VzZXInXS5nZXQoJ2VtYWlsQWRkcmVzcycs IE5vbmUpLAogICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgICByZXN1bHQuX3Jldmll d2Vycy5hcHBlbmQocmV2aWV3ZXIpCi0gICAgICAgICAgICAgICAgaWYgcmRhdGEuZ2V0KCdhcHBy b3ZlZCcsIEZhbHNlKToKKyAgICAgICAgICAgICAgICBpZiByZGF0YS5nZXQoJ2FwcHJvdmVkJywg RmFsc2UpIGFuZCAobm90IG5lZWRzX3N0YXR1cyBvciByZXZpZXdlci5zdGF0dXMgPT0gQ29udHJp YnV0b3IuUkVWSUVXRVIpOgogICAgICAgICAgICAgICAgICAgICByZXN1bHQuX2FwcHJvdmVycy5h cHBlbmQocmV2aWV3ZXIpCiAgICAgICAgICAgICAgICAgaWYgcmRhdGEuZ2V0KCdzdGF0dXMnKSA9 PSAnTkVFRFNfV09SSyc6CiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5fYmxvY2tlcnMuYXBw ZW5kKHJldmlld2VyKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQppbmRleCA2M2M3 NDMzNzc5ZWVkNTBmOGUyZTJiM2UwNTM5NTg2Nzk4ZTk2NzcxLi4wYTEwMWIwMjFmOWM1YjdmNmFj NjNlYTAxZTk2YjMxNGE2MzE2YWQwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQorKysgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5w eQpAQCAtMTYyLDcgKzE2Miw3IEBAIGNsYXNzIEdpdEh1YihTY20pOgogICAgICAgICAgICAgICAg IHJldHVybiBDb250cmlidXRvcih1c2VybmFtZSkKIAogICAgICAgICAgICAgZGF0YSA9IHJlc3Bv bnNlLmpzb24oKQotICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1 dG9ycy5jcmVhdGUoZGF0YS5nZXQoJ25hbWUnLCB1c2VybmFtZSksIGRhdGEuZ2V0KCdlbWFpbCcp KQorICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5jcmVh dGUoZGF0YS5nZXQoJ25hbWUnLCB1c2VybmFtZSkgb3IgdXNlcm5hbWUsIGRhdGEuZ2V0KCdlbWFp bCcpKQogICAgICAgICAgICAgcmVzdWx0LmdpdGh1YiA9IHVzZXJuYW1lCiAgICAgICAgICAgICBz ZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3JzW3VzZXJuYW1lXSA9IHJlc3VsdAogICAgICAgICAg ICAgcmV0dXJuIHJlc3VsdApAQCAtMTcyLDEwICsxNzIsMTEgQEAgY2xhc3MgR2l0SHViKFNjbSk6 CiAgICAgICAgICAgICBwdWxsX3JlcXVlc3QuX3Jldmlld2VycyA9IFtzZWxmLl9jb250cmlidXRv cih1c2VyWydsb2dpbiddKSBmb3IgdXNlciBpbiByZXNwb25zZS5nZXQoJ3VzZXJzJywgW10pXQog ICAgICAgICAgICAgcHVsbF9yZXF1ZXN0Ll9hcHByb3ZlcnMgPSBbXQogICAgICAgICAgICAgcHVs bF9yZXF1ZXN0Ll9ibG9ja2VycyA9IFtdCisgICAgICAgICAgICBuZWVkc19zdGF0dXMgPSBDb250 cmlidXRvci5SRVZJRVdFUiBpbiBzZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3JzLnN0YXR1c2Vz CiAgICAgICAgICAgICBmb3IgcmV2aWV3IGluIHNlbGYucmVwb3NpdG9yeS5yZXF1ZXN0KCdwdWxs cy97fS9yZXZpZXdzJy5mb3JtYXQocHVsbF9yZXF1ZXN0Lm51bWJlcikpOgogICAgICAgICAgICAg ICAgIGNvbnRyaWJ1dG9yID0gc2VsZi5fY29udHJpYnV0b3IocmV2aWV3Wyd1c2VyJ11bJ2xvZ2lu J10pCiAgICAgICAgICAgICAgICAgcHVsbF9yZXF1ZXN0Ll9yZXZpZXdlcnMuYXBwZW5kKGNvbnRy aWJ1dG9yKQotICAgICAgICAgICAgICAgIGlmIHJldmlldy5nZXQoJ3N0YXRlJykgPT0gJ0FQUFJP VkVEJzoKKyAgICAgICAgICAgICAgICBpZiByZXZpZXcuZ2V0KCdzdGF0ZScpID09ICdBUFBST1ZF RCcgYW5kIChub3QgbmVlZHNfc3RhdHVzIG9yIGNvbnRyaWJ1dG9yLnN0YXR1cyA9PSBDb250cmli dXRvci5SRVZJRVdFUik6CiAgICAgICAgICAgICAgICAgICAgIHB1bGxfcmVxdWVzdC5fYXBwcm92 ZXJzLmFwcGVuZChjb250cmlidXRvcikKICAgICAgICAgICAgICAgICBlbGlmIHJldmlldy5nZXQo J3N0YXRlJykgPT0gJ0NIQU5HRVNfUkVRVUVTVEVEJzoKICAgICAgICAgICAgICAgICAgICAgcHVs bF9yZXF1ZXN0Ll9ibG9ja2Vycy5hcHBlbmQoY29udHJpYnV0b3IpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVx dWVzdF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CmluZGV4IDAxMzAzOTQwODRh NGI1ODMyYzVjYjRlYjZiNmU1YTQ0Zjg1ZTI4MWQuLmY5NmJmZWYzMDI1ZmU5MDAyM2FkNDk2ODcy ODUxY2RkZGIwNzFmM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9y ZXF1ZXN0X3VuaXR0ZXN0LnB5CkBAIC00OTMsNiArNDkzLDIyIEBAIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5hcHByb3ZlcnMsIFtD b250cmlidXRvcignRWFnZXIgUmV2aWV3ZXInLCBbJ2VyZXZpZXdlckB3ZWJraXQub3JnJ10pXSkK ICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYmxvY2tlcnMsIFtDb250cmlidXRvcign U3VzcGljaW91cyBSZXZpZXdlcicsIFsnc3Jldmlld2VyQHdlYmtpdC5vcmcnXSldKQogCisgICAg ZGVmIHRlc3RfYXBwcm92ZXJzX3N0YXR1cyhzZWxmKToKKyAgICAgICAgd2l0aCBzZWxmLndlYnNl cnZlcigpOgorICAgICAgICAgICAgcmVwbyA9IHJlbW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpCisg ICAgICAgICAgICByZXBvLmNvbnRyaWJ1dG9ycy5hZGQoQ29udHJpYnV0b3IoCisgICAgICAgICAg ICAgICAgJ1N1c3BpY2lvdXMgUmV2aWV3ZXInLCBbJ3NyZXZpZXdlckB3ZWJraXQub3JnJ10sCisg ICAgICAgICAgICAgICAgZ2l0aHViPSdzcmV2aWV3ZXInLCBzdGF0dXM9Q29udHJpYnV0b3IuUkVW SUVXRVIsCisgICAgICAgICAgICApKQorICAgICAgICAgICAgcHIgPSByZXBvLnB1bGxfcmVxdWVz dHMuZ2V0KDEpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLnJldmlld2VycywgWwor ICAgICAgICAgICAgICAgIENvbnRyaWJ1dG9yKCdFYWdlciBSZXZpZXdlcicsIFsnZXJldmlld2Vy QHdlYmtpdC5vcmcnXSksCisgICAgICAgICAgICAgICAgQ29udHJpYnV0b3IoJ1JlbHVjdGFudCBS ZXZpZXdlcicsIFsncnJldmlld2VyQHdlYmtpdC5vcmcnXSksCisgICAgICAgICAgICAgICAgQ29u dHJpYnV0b3IoJ1N1c3BpY2lvdXMgUmV2aWV3ZXInLCBbJ3NyZXZpZXdlckB3ZWJraXQub3JnJ10p LAorICAgICAgICAgICAgXSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYXBwcm92 ZXJzLCBbXSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYmxvY2tlcnMsIFtDb250 cmlidXRvcignU3VzcGljaW91cyBSZXZpZXdlcicsIFsnc3Jldmlld2VyQHdlYmtpdC5vcmcnXSld KQorCiAKIGNsYXNzIFRlc3ROZXR3b3JrUHVsbFJlcXVlc3RCaXRCdWNrZXQodW5pdHRlc3QuVGVz dENhc2UpOgogICAgIHJlbW90ZSA9ICdodHRwczovL2JpdGJ1Y2tldC5leGFtcGxlLmNvbS9wcm9q ZWN0cy9XRUJLSVQvcmVwb3Mvd2Via2l0JwpAQCAtNTc0LDMgKzU5MCwxOSBAQCBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KICAgICAgICAgICAgIF0pCiAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHByLmFwcHJvdmVycywgW0NvbnRyaWJ1dG9yKCdFYWdlciBSZXZpZXdlcicsIFsnZXJl dmlld2VyQHdlYmtpdC5vcmcnXSldKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5i bG9ja2VycywgW0NvbnRyaWJ1dG9yKCdTdXNwaWNpb3VzIFJldmlld2VyJywgWydzcmV2aWV3ZXJA d2Via2l0Lm9yZyddKV0pCisKKyAgICBkZWYgdGVzdF9hcHByb3ZlcnNfc3RhdHVzKHNlbGYpOgor ICAgICAgICB3aXRoIHNlbGYud2Vic2VydmVyKCk6CisgICAgICAgICAgICByZXBvID0gcmVtb3Rl LkJpdEJ1Y2tldChzZWxmLnJlbW90ZSkKKyAgICAgICAgICAgIHJlcG8uY29udHJpYnV0b3JzLmFk ZChDb250cmlidXRvcigKKyAgICAgICAgICAgICAgICAnU3VzcGljaW91cyBSZXZpZXdlcicsIFsn c3Jldmlld2VyQHdlYmtpdC5vcmcnXSwKKyAgICAgICAgICAgICAgICBnaXRodWI9J3NyZXZpZXdl cicsIHN0YXR1cz1Db250cmlidXRvci5SRVZJRVdFUiwKKyAgICAgICAgICAgICkpCisgICAgICAg ICAgICBwciA9IHJlcG8ucHVsbF9yZXF1ZXN0cy5nZXQoMSkKKyAgICAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwocHIucmV2aWV3ZXJzLCBbCisgICAgICAgICAgICAgICAgQ29udHJpYnV0b3IoJ0Vh Z2VyIFJldmlld2VyJywgWydlcmV2aWV3ZXJAd2Via2l0Lm9yZyddKSwKKyAgICAgICAgICAgICAg ICBDb250cmlidXRvcignUmVsdWN0YW50IFJldmlld2VyJywgWydycmV2aWV3ZXJAd2Via2l0Lm9y ZyddKSwKKyAgICAgICAgICAgICAgICBDb250cmlidXRvcignU3VzcGljaW91cyBSZXZpZXdlcics IFsnc3Jldmlld2VyQHdlYmtpdC5vcmcnXSksCisgICAgICAgICAgICBdKQorICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChwci5hcHByb3ZlcnMsIFtdKQorICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChwci5ibG9ja2VycywgW0NvbnRyaWJ1dG9yKCdTdXNwaWNpb3VzIFJldmlld2VyJywg WydzcmV2aWV3ZXJAd2Via2l0Lm9yZyddKV0pCg== 441761 2021-10-19 11:23:36 -0700 2021-10-19 11:26:10 -0700 Patch for landing bug-231843-20211019112335.patch text/plain 10573 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NDY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzBmZmY1NGU0NzAwODNlMGFlODdlNWUyODI0MzI1YTg0 MTcyMjEwNC4uODVkYWJlMzQwZWQxNGQzMDFlMzBhYWYxOTBjOTczNTU3NTU1NGFhZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTEwLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEZpbHRlciBhcHByb3ZlcnMgYnkgc3RhdHVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE4NDMKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzg0MzIwOTM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIElmIGEgcHJvamVjdCBkZWZpbmVzIHN0YXR1c2VzIGZvciBpdCdz IGNvbnRyaWJ1dG9ycywgd2Ugb25seSB3YW50CisgICAgICAgIHRvIGFsbG93IHJldmlld2VycyB0 byBhcHByb3ZlIGNoYW5nZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weToKKyAgICAgICAgKENvbnRyaWJ1dG9yKTog QWRkIHJldmlld2VyIHN0YXR1cy4KKyAgICAgICAgKENvbnRyaWJ1dG9yLk1hcHBpbmcubG9hZCk6 IEtlZXAgdHJhY2sgb2YgcG9zc2libGUgc3RhdHVzZXMuCisgICAgICAgIChDb250cmlidXRvci5N YXBwaW5nLl9faW5pdF9fKTogRGl0dG8uCisgICAgICAgIChDb250cmlidXRvci5NYXBwaW5nLmFk ZCk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHk6CisgICAgICAgIChCaXRCdWNrZXQuUFJHZW5lcmF0 b3IuUHVsbFJlcXVlc3QpOiBJZiBhIHByb2plY3QgZGVmaW5lcyBhIHJldmlld2VyIHN0YXR1cywg ZW5mb3JjZSBpdC4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weToKKyAgICAgICAgKEdpdEh1Yi5QUkdlbmVyYXRvci5f Y29udHJpYnV0b3IpOiBIYW5kbGUgY2FzZSB3aGVyZSBubyBuYW1lIGlzIGRlZmluZWQuCisgICAg ICAgIChHaXRIdWIuUFJHZW5lcmF0b3IucmV2aWV3ZXJzKTogSWYgYSBwcm9qZWN0IGRlZmluZXMg YSByZXZpZXdlciBzdGF0dXMsIGVuZm9yY2UgaXQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHk6 CisKIDIwMjEtMTAtMTkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBVc2UgSlNPTlZhbHVlcyBpbnN0ZWFkIG9mIGEgSlNDOjpWTSB0byBwYXJz ZSBXS0NvbnRlbnRSdWxlTGlzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvc2V0dXAucHkKaW5kZXggMzM3Yjc0MzdhYmJiNzFjODZmZmY0N2NmNjg4NTU3MWI1Mjk3Y2I0 Zi4uMzBiMGYwNWM3NjhiYzEyNWE0MDRjMzRhZTAxZTVlZGM4MGRiYmQyNiAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKKysrIGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKQEAgLTI5LDcgKzI5LDcgQEAg ZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScsCi0gICAgdmVy c2lvbj0nMi4yLjEyJywKKyAgICB2ZXJzaW9uPScyLjIuMTMnLAogICAgIGRlc2NyaXB0aW9uPSdM aWJyYXJ5IGRlc2lnbmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVz LicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L19faW5pdF9fLnB5CmluZGV4IGI4Njg0N2ZkYmVkMzQ5MzljZDQ3NGVkZTVlODY2MDFh YWU1ODEyNzkuLjczNWQ1MTllYzQyOWY4NDUxYmJiNjk0N2UwMWZiYjAxMzgyM2FkYTEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19f aW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L19faW5pdF9fLnB5CkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoK ICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3 ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAg KQogCi12ZXJzaW9uID0gVmVyc2lvbigyLCAyLCAxMikKK3ZlcnNpb24gPSBWZXJzaW9uKDIsIDIs IDEzKQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9u KDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBW ZXJzaW9uKDEsIDUpKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkKaW5kZXggNDUyY2Y3OGQy MDQxOGQ2ZjM5NmU0YjNhNzAzMjdlZjRiNWVlYzhkOS4uYWM1ZmI4NDBmMGQ4MjQwZjdmMmU3MTQ5 OGFlODhhZGViYzVkODdjNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkKQEAgLTM1LDYg KzM1LDcgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICBTVk5fQVVUSE9SX1JFID0g cmUuY29tcGlsZShyJ3IoP1A8cmV2aXNpb24+XGQrKSBcfCAoP1A8ZW1haWw+LiopIFx8ICg/UDxk YXRlPi4qKSBcfCBcZCsgbGluZXM/JykKICAgICBTVk5fQVVUSE9SX1FfUkUgPSByZS5jb21waWxl KHIncig/UDxyZXZpc2lvbj5cZCspIFx8ICg/UDxlbWFpbD4uKikgXHwgKD9QPGRhdGU+LiopJykK ICAgICBTVk5fUEFUQ0hfRlJPTV9SRSA9IHJlLmNvbXBpbGUocidQYXRjaCBieSAoP1A8YXV0aG9y Pi4qKSA8KD9QPGVtYWlsPi4qKT4gb24gXGQrLVxkKy1cZCsnKQorICAgIFJFVklFV0VSID0gJ3Jl dmlld2VyJwogCiAgICAgY2xhc3MgRW5jb2Rlcihqc29uLkpTT05FbmNvZGVyKToKIApAQCAtNjgs NiArNjksOCBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAgICAgIGNy ZWF0ZWQuZ2l0aHViID0gY29udHJpYnV0b3IuZ2V0KCdnaXRodWInLCBjcmVhdGVkLmdpdGh1YikK ICAgICAgICAgICAgICAgICBjcmVhdGVkLmJpdGJ1Y2tldCA9IGNvbnRyaWJ1dG9yLmdldCgnYml0 YnVja2V0JywgY3JlYXRlZC5iaXRidWNrZXQpCiAKKyAgICAgICAgICAgICAgICByZXN1bHQuc3Rh dHVzZXMuYWRkKGNyZWF0ZWQuc3RhdHVzKQorCiAgICAgICAgICAgICAgICAgaWYgY3JlYXRlZC5n aXRodWI6CiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdFtjcmVhdGVkLmdpdGh1Yl0gPSBjcmVh dGVkCiAgICAgICAgICAgICAgICAgaWYgY3JlYXRlZC5iaXRidWNrZXQ6CkBAIC04NSw2ICs4OCw3 IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAKICAgICAgICAgZGVmIF9faW5pdF9fKHNl bGYpOgogICAgICAgICAgICAgc3VwZXIoQ29udHJpYnV0b3IuTWFwcGluZywgc2VsZikuX19pbml0 X18obGFtYmRhOiBOb25lKQorICAgICAgICAgICAgc2VsZi5zdGF0dXNlcyA9IHNldCgpCiAKICAg ICAgICAgZGVmIHNhdmUoc2VsZiwgZmlsZSk6CiAgICAgICAgICAgICBhbGlhc190b19uYW1lID0g ZGVmYXVsdGRpY3QobGlzdCkKQEAgLTExMSw2ICsxMTUsOCBAQCBjbGFzcyBDb250cmlidXRvcihv YmplY3QpOgogICAgICAgICAgICAgcmVzdWx0LmdpdGh1YiA9IGNvbnRyaWJ1dG9yLmdpdGh1YiBv ciByZXN1bHQuZ2l0aHViCiAgICAgICAgICAgICByZXN1bHQuYml0YnVja2V0ID0gY29udHJpYnV0 b3IuYml0YnVja2V0IG9yIHJlc3VsdC5iaXRidWNrZXQKIAorICAgICAgICAgICAgc2VsZi5zdGF0 dXNlcy5hZGQocmVzdWx0LnN0YXR1cykKKwogICAgICAgICAgICAgaWYgcmVzdWx0LmdpdGh1YjoK ICAgICAgICAgICAgICAgICBzZWxmW3Jlc3VsdC5naXRodWJdID0gcmVzdWx0CiAgICAgICAgICAg ICBpZiByZXN1bHQuYml0YnVja2V0OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5weSBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9iaXRidWNrZXQu cHkKaW5kZXggOTY2ZmVkZTViODc3M2Y5NzhlMDgzZGM4MzY2OGM5NWViMDU5ZjQ0Ny4uMmY1MGY2 YjcxMDVkODBmMTA1NzgwZWMzODEwZGM4OTNmMjYwYzM5NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9y ZW1vdGUvYml0YnVja2V0LnB5CkBAIC0yNSwxMCArMjUsOCBAQCBpbXBvcnQgcmVxdWVzdHMKIGlt cG9ydCBzaXgKIGltcG9ydCBzeXMKIAotaW1wb3J0IGpzb24KLQogZnJvbSB3ZWJraXRjb3JlcHkg aW1wb3J0IGRlY29yYXRvcnMKLWZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgUHVsbFJl cXVlc3QKK2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgQ29udHJpYnV0b3IsIFB1bGxS ZXF1ZXN0CiBmcm9tIHdlYmtpdHNjbXB5LnJlbW90ZS5zY20gaW1wb3J0IFNjbQogCiAKQEAgLTU4 LDEzICs1NiwxNCBAQCBjbGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICAgICAgICAgIHJlc3VsdC5f cmV2aWV3ZXJzID0gW10KICAgICAgICAgICAgIHJlc3VsdC5fYXBwcm92ZXJzID0gW10KICAgICAg ICAgICAgIHJlc3VsdC5fYmxvY2tlcnMgPSBbXQorICAgICAgICAgICAgbmVlZHNfc3RhdHVzID0g Q29udHJpYnV0b3IuUkVWSUVXRVIgaW4gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5zdGF0 dXNlcwogICAgICAgICAgICAgZm9yIHJkYXRhIGluIGRhdGEuZ2V0KCdyZXZpZXdlcnMnLCBbXSk6 CiAgICAgICAgICAgICAgICAgcmV2aWV3ZXIgPSBzZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3Jz LmNyZWF0ZSgKICAgICAgICAgICAgICAgICAgICAgcmRhdGFbJ3VzZXInXVsnZGlzcGxheU5hbWUn XSwKICAgICAgICAgICAgICAgICAgICAgcmRhdGFbJ3VzZXInXS5nZXQoJ2VtYWlsQWRkcmVzcycs IE5vbmUpLAogICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgICByZXN1bHQuX3Jldmll d2Vycy5hcHBlbmQocmV2aWV3ZXIpCi0gICAgICAgICAgICAgICAgaWYgcmRhdGEuZ2V0KCdhcHBy b3ZlZCcsIEZhbHNlKToKKyAgICAgICAgICAgICAgICBpZiByZGF0YS5nZXQoJ2FwcHJvdmVkJywg RmFsc2UpIGFuZCAobm90IG5lZWRzX3N0YXR1cyBvciByZXZpZXdlci5zdGF0dXMgPT0gQ29udHJp YnV0b3IuUkVWSUVXRVIpOgogICAgICAgICAgICAgICAgICAgICByZXN1bHQuX2FwcHJvdmVycy5h cHBlbmQocmV2aWV3ZXIpCiAgICAgICAgICAgICAgICAgaWYgcmRhdGEuZ2V0KCdzdGF0dXMnKSA9 PSAnTkVFRFNfV09SSyc6CiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5fYmxvY2tlcnMuYXBw ZW5kKHJldmlld2VyKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQppbmRleCA2M2M3 NDMzNzc5ZWVkNTBmOGUyZTJiM2UwNTM5NTg2Nzk4ZTk2NzcxLi4wYTEwMWIwMjFmOWM1YjdmNmFj NjNlYTAxZTk2YjMxNGE2MzE2YWQwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQorKysgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5w eQpAQCAtMTYyLDcgKzE2Miw3IEBAIGNsYXNzIEdpdEh1YihTY20pOgogICAgICAgICAgICAgICAg IHJldHVybiBDb250cmlidXRvcih1c2VybmFtZSkKIAogICAgICAgICAgICAgZGF0YSA9IHJlc3Bv bnNlLmpzb24oKQotICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1 dG9ycy5jcmVhdGUoZGF0YS5nZXQoJ25hbWUnLCB1c2VybmFtZSksIGRhdGEuZ2V0KCdlbWFpbCcp KQorICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5jcmVh dGUoZGF0YS5nZXQoJ25hbWUnLCB1c2VybmFtZSkgb3IgdXNlcm5hbWUsIGRhdGEuZ2V0KCdlbWFp bCcpKQogICAgICAgICAgICAgcmVzdWx0LmdpdGh1YiA9IHVzZXJuYW1lCiAgICAgICAgICAgICBz ZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3JzW3VzZXJuYW1lXSA9IHJlc3VsdAogICAgICAgICAg ICAgcmV0dXJuIHJlc3VsdApAQCAtMTcyLDEwICsxNzIsMTEgQEAgY2xhc3MgR2l0SHViKFNjbSk6 CiAgICAgICAgICAgICBwdWxsX3JlcXVlc3QuX3Jldmlld2VycyA9IFtzZWxmLl9jb250cmlidXRv cih1c2VyWydsb2dpbiddKSBmb3IgdXNlciBpbiByZXNwb25zZS5nZXQoJ3VzZXJzJywgW10pXQog ICAgICAgICAgICAgcHVsbF9yZXF1ZXN0Ll9hcHByb3ZlcnMgPSBbXQogICAgICAgICAgICAgcHVs bF9yZXF1ZXN0Ll9ibG9ja2VycyA9IFtdCisgICAgICAgICAgICBuZWVkc19zdGF0dXMgPSBDb250 cmlidXRvci5SRVZJRVdFUiBpbiBzZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3JzLnN0YXR1c2Vz CiAgICAgICAgICAgICBmb3IgcmV2aWV3IGluIHNlbGYucmVwb3NpdG9yeS5yZXF1ZXN0KCdwdWxs cy97fS9yZXZpZXdzJy5mb3JtYXQocHVsbF9yZXF1ZXN0Lm51bWJlcikpOgogICAgICAgICAgICAg ICAgIGNvbnRyaWJ1dG9yID0gc2VsZi5fY29udHJpYnV0b3IocmV2aWV3Wyd1c2VyJ11bJ2xvZ2lu J10pCiAgICAgICAgICAgICAgICAgcHVsbF9yZXF1ZXN0Ll9yZXZpZXdlcnMuYXBwZW5kKGNvbnRy aWJ1dG9yKQotICAgICAgICAgICAgICAgIGlmIHJldmlldy5nZXQoJ3N0YXRlJykgPT0gJ0FQUFJP VkVEJzoKKyAgICAgICAgICAgICAgICBpZiByZXZpZXcuZ2V0KCdzdGF0ZScpID09ICdBUFBST1ZF RCcgYW5kIChub3QgbmVlZHNfc3RhdHVzIG9yIGNvbnRyaWJ1dG9yLnN0YXR1cyA9PSBDb250cmli dXRvci5SRVZJRVdFUik6CiAgICAgICAgICAgICAgICAgICAgIHB1bGxfcmVxdWVzdC5fYXBwcm92 ZXJzLmFwcGVuZChjb250cmlidXRvcikKICAgICAgICAgICAgICAgICBlbGlmIHJldmlldy5nZXQo J3N0YXRlJykgPT0gJ0NIQU5HRVNfUkVRVUVTVEVEJzoKICAgICAgICAgICAgICAgICAgICAgcHVs bF9yZXF1ZXN0Ll9ibG9ja2Vycy5hcHBlbmQoY29udHJpYnV0b3IpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVx dWVzdF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CmluZGV4IDAxMzAzOTQwODRh NGI1ODMyYzVjYjRlYjZiNmU1YTQ0Zjg1ZTI4MWQuLmY5NmJmZWYzMDI1ZmU5MDAyM2FkNDk2ODcy ODUxY2RkZGIwNzFmM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9y ZXF1ZXN0X3VuaXR0ZXN0LnB5CkBAIC00OTMsNiArNDkzLDIyIEBAIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5hcHByb3ZlcnMsIFtD b250cmlidXRvcignRWFnZXIgUmV2aWV3ZXInLCBbJ2VyZXZpZXdlckB3ZWJraXQub3JnJ10pXSkK ICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYmxvY2tlcnMsIFtDb250cmlidXRvcign U3VzcGljaW91cyBSZXZpZXdlcicsIFsnc3Jldmlld2VyQHdlYmtpdC5vcmcnXSldKQogCisgICAg ZGVmIHRlc3RfYXBwcm92ZXJzX3N0YXR1cyhzZWxmKToKKyAgICAgICAgd2l0aCBzZWxmLndlYnNl cnZlcigpOgorICAgICAgICAgICAgcmVwbyA9IHJlbW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpCisg ICAgICAgICAgICByZXBvLmNvbnRyaWJ1dG9ycy5hZGQoQ29udHJpYnV0b3IoCisgICAgICAgICAg ICAgICAgJ1N1c3BpY2lvdXMgUmV2aWV3ZXInLCBbJ3NyZXZpZXdlckB3ZWJraXQub3JnJ10sCisg ICAgICAgICAgICAgICAgZ2l0aHViPSdzcmV2aWV3ZXInLCBzdGF0dXM9Q29udHJpYnV0b3IuUkVW SUVXRVIsCisgICAgICAgICAgICApKQorICAgICAgICAgICAgcHIgPSByZXBvLnB1bGxfcmVxdWVz dHMuZ2V0KDEpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLnJldmlld2VycywgWwor ICAgICAgICAgICAgICAgIENvbnRyaWJ1dG9yKCdFYWdlciBSZXZpZXdlcicsIFsnZXJldmlld2Vy QHdlYmtpdC5vcmcnXSksCisgICAgICAgICAgICAgICAgQ29udHJpYnV0b3IoJ1JlbHVjdGFudCBS ZXZpZXdlcicsIFsncnJldmlld2VyQHdlYmtpdC5vcmcnXSksCisgICAgICAgICAgICAgICAgQ29u dHJpYnV0b3IoJ1N1c3BpY2lvdXMgUmV2aWV3ZXInLCBbJ3NyZXZpZXdlckB3ZWJraXQub3JnJ10p LAorICAgICAgICAgICAgXSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYXBwcm92 ZXJzLCBbXSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYmxvY2tlcnMsIFtDb250 cmlidXRvcignU3VzcGljaW91cyBSZXZpZXdlcicsIFsnc3Jldmlld2VyQHdlYmtpdC5vcmcnXSld KQorCiAKIGNsYXNzIFRlc3ROZXR3b3JrUHVsbFJlcXVlc3RCaXRCdWNrZXQodW5pdHRlc3QuVGVz dENhc2UpOgogICAgIHJlbW90ZSA9ICdodHRwczovL2JpdGJ1Y2tldC5leGFtcGxlLmNvbS9wcm9q ZWN0cy9XRUJLSVQvcmVwb3Mvd2Via2l0JwpAQCAtNTc0LDMgKzU5MCwxOSBAQCBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KICAgICAgICAgICAgIF0pCiAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHByLmFwcHJvdmVycywgW0NvbnRyaWJ1dG9yKCdFYWdlciBSZXZpZXdlcicsIFsnZXJl dmlld2VyQHdlYmtpdC5vcmcnXSldKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5i bG9ja2VycywgW0NvbnRyaWJ1dG9yKCdTdXNwaWNpb3VzIFJldmlld2VyJywgWydzcmV2aWV3ZXJA d2Via2l0Lm9yZyddKV0pCisKKyAgICBkZWYgdGVzdF9hcHByb3ZlcnNfc3RhdHVzKHNlbGYpOgor ICAgICAgICB3aXRoIHNlbGYud2Vic2VydmVyKCk6CisgICAgICAgICAgICByZXBvID0gcmVtb3Rl LkJpdEJ1Y2tldChzZWxmLnJlbW90ZSkKKyAgICAgICAgICAgIHJlcG8uY29udHJpYnV0b3JzLmFk ZChDb250cmlidXRvcigKKyAgICAgICAgICAgICAgICAnU3VzcGljaW91cyBSZXZpZXdlcicsIFsn c3Jldmlld2VyQHdlYmtpdC5vcmcnXSwKKyAgICAgICAgICAgICAgICBnaXRodWI9J3NyZXZpZXdl cicsIHN0YXR1cz1Db250cmlidXRvci5SRVZJRVdFUiwKKyAgICAgICAgICAgICkpCisgICAgICAg ICAgICBwciA9IHJlcG8ucHVsbF9yZXF1ZXN0cy5nZXQoMSkKKyAgICAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwocHIucmV2aWV3ZXJzLCBbCisgICAgICAgICAgICAgICAgQ29udHJpYnV0b3IoJ0Vh Z2VyIFJldmlld2VyJywgWydlcmV2aWV3ZXJAd2Via2l0Lm9yZyddKSwKKyAgICAgICAgICAgICAg ICBDb250cmlidXRvcignUmVsdWN0YW50IFJldmlld2VyJywgWydycmV2aWV3ZXJAd2Via2l0Lm9y ZyddKSwKKyAgICAgICAgICAgICAgICBDb250cmlidXRvcignU3VzcGljaW91cyBSZXZpZXdlcics IFsnc3Jldmlld2VyQHdlYmtpdC5vcmcnXSksCisgICAgICAgICAgICBdKQorICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChwci5hcHByb3ZlcnMsIFtdKQorICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChwci5ibG9ja2VycywgW0NvbnRyaWJ1dG9yKCdTdXNwaWNpb3VzIFJldmlld2VyJywg WydzcmV2aWV3ZXJAd2Via2l0Lm9yZyddKV0pCg== 441762 2021-10-19 11:26:12 -0700 2021-10-19 12:39:35 -0700 Patch for landing bug-231843-20211019112611.patch text/plain 10568 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NDY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzBmZmY1NGU0NzAwODNlMGFlODdlNWUyODI0MzI1YTg0 MTcyMjEwNC4uNzdhMmY0MmYzYzI2NDVmNzljNzU2ZDBlNDYwYjllY2JjYjM2MWFjNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTEwLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEZpbHRlciBhcHByb3ZlcnMgYnkgc3RhdHVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE4NDMKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzg0MzIwOTM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IERld2VpIFpo dS4KKworICAgICAgICBJZiBhIHByb2plY3QgZGVmaW5lcyBzdGF0dXNlcyBmb3IgaXQncyBjb250 cmlidXRvcnMsIHdlIG9ubHkgd2FudAorICAgICAgICB0byBhbGxvdyByZXZpZXdlcnMgdG8gYXBw cm92ZSBjaGFuZ2VzLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvY29udHJpYnV0b3IucHk6CisgICAgICAgIChDb250cmlidXRvcik6IEFkZCBy ZXZpZXdlciBzdGF0dXMuCisgICAgICAgIChDb250cmlidXRvci5NYXBwaW5nLmxvYWQpOiBLZWVw IHRyYWNrIG9mIHBvc3NpYmxlIHN0YXR1c2VzLgorICAgICAgICAoQ29udHJpYnV0b3IuTWFwcGlu Zy5fX2luaXRfXyk6IERpdHRvLgorICAgICAgICAoQ29udHJpYnV0b3IuTWFwcGluZy5hZGQpOiBE aXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9yZW1vdGUvYml0YnVja2V0LnB5OgorICAgICAgICAoQml0QnVja2V0LlBSR2VuZXJhdG9yLlB1 bGxSZXF1ZXN0KTogSWYgYSBwcm9qZWN0IGRlZmluZXMgYSByZXZpZXdlciBzdGF0dXMsIGVuZm9y Y2UgaXQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvcmVtb3RlL2dpdF9odWIucHk6CisgICAgICAgIChHaXRIdWIuUFJHZW5lcmF0b3IuX2NvbnRy aWJ1dG9yKTogSGFuZGxlIGNhc2Ugd2hlcmUgbm8gbmFtZSBpcyBkZWZpbmVkLgorICAgICAgICAo R2l0SHViLlBSR2VuZXJhdG9yLnJldmlld2Vycyk6IElmIGEgcHJvamVjdCBkZWZpbmVzIGEgcmV2 aWV3ZXIgc3RhdHVzLCBlbmZvcmNlIGl0LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5OgorCiAy MDIxLTEwLTE5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVXNlIEpTT05WYWx1ZXMgaW5zdGVhZCBvZiBhIEpTQzo6Vk0gdG8gcGFyc2UgV0tD b250ZW50UnVsZUxpc3RzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS9zZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3Nl dHVwLnB5CmluZGV4IDMzN2I3NDM3YWJiYjcxYzg2ZmZmNDdjZjY4ODU1NzFiNTI5N2NiNGYuLjMw YjBmMDVjNzY4YmMxMjVhNDA0YzM0YWUwMWU1ZWRjODBkYmJkMjYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CkBAIC0yOSw3ICsyOSw3IEBAIGRlZiBy ZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249 JzIuMi4xMicsCisgICAgdmVyc2lvbj0nMi4yLjEzJywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFy eSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4nLAog ICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19p bml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9fX2luaXRfXy5weQppbmRleCBiODY4NDdmZGJlZDM0OTM5Y2Q0NzRlZGU1ZTg2NjAxYWFlNTgx Mjc5Li43MzVkNTE5ZWM0MjlmODQ1MWJiYjY5NDdlMDFmYmIwMTM4MjNhZGExIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRf Xy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9fX2luaXRfXy5weQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAg ICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0 Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAot dmVyc2lvbiA9IFZlcnNpb24oMiwgMiwgMTIpCit2ZXJzaW9uID0gVmVyc2lvbigyLCAyLCAxMykK IAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAx NSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9ub3RvbmljJywgVmVyc2lv bigxLCA1KSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9jb250cmlidXRvci5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CmluZGV4IDQ1MmNmNzhkMjA0MThk NmYzOTZlNGIzYTcwMzI3ZWY0YjVlZWM4ZDkuLmFjNWZiODQwZjBkODI0MGY3ZjJlNzE0OThhZTg4 YWRlYmM1ZDg3YzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CkBAIC0zNSw2ICszNSw3 IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgU1ZOX0FVVEhPUl9SRSA9IHJlLmNv bXBpbGUocidyKD9QPHJldmlzaW9uPlxkKykgXHwgKD9QPGVtYWlsPi4qKSBcfCAoP1A8ZGF0ZT4u KikgXHwgXGQrIGxpbmVzPycpCiAgICAgU1ZOX0FVVEhPUl9RX1JFID0gcmUuY29tcGlsZShyJ3Io P1A8cmV2aXNpb24+XGQrKSBcfCAoP1A8ZW1haWw+LiopIFx8ICg/UDxkYXRlPi4qKScpCiAgICAg U1ZOX1BBVENIX0ZST01fUkUgPSByZS5jb21waWxlKHInUGF0Y2ggYnkgKD9QPGF1dGhvcj4uKikg PCg/UDxlbWFpbD4uKik+IG9uIFxkKy1cZCstXGQrJykKKyAgICBSRVZJRVdFUiA9ICdyZXZpZXdl cicKIAogICAgIGNsYXNzIEVuY29kZXIoanNvbi5KU09ORW5jb2Rlcik6CiAKQEAgLTY4LDYgKzY5 LDggQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICAgICAgICAgICAgICBjcmVhdGVk LmdpdGh1YiA9IGNvbnRyaWJ1dG9yLmdldCgnZ2l0aHViJywgY3JlYXRlZC5naXRodWIpCiAgICAg ICAgICAgICAgICAgY3JlYXRlZC5iaXRidWNrZXQgPSBjb250cmlidXRvci5nZXQoJ2JpdGJ1Y2tl dCcsIGNyZWF0ZWQuYml0YnVja2V0KQogCisgICAgICAgICAgICAgICAgcmVzdWx0LnN0YXR1c2Vz LmFkZChjcmVhdGVkLnN0YXR1cykKKwogICAgICAgICAgICAgICAgIGlmIGNyZWF0ZWQuZ2l0aHVi OgogICAgICAgICAgICAgICAgICAgICByZXN1bHRbY3JlYXRlZC5naXRodWJdID0gY3JlYXRlZAog ICAgICAgICAgICAgICAgIGlmIGNyZWF0ZWQuYml0YnVja2V0OgpAQCAtODUsNiArODgsNyBAQCBj bGFzcyBDb250cmlidXRvcihvYmplY3QpOgogCiAgICAgICAgIGRlZiBfX2luaXRfXyhzZWxmKToK ICAgICAgICAgICAgIHN1cGVyKENvbnRyaWJ1dG9yLk1hcHBpbmcsIHNlbGYpLl9faW5pdF9fKGxh bWJkYTogTm9uZSkKKyAgICAgICAgICAgIHNlbGYuc3RhdHVzZXMgPSBzZXQoKQogCiAgICAgICAg IGRlZiBzYXZlKHNlbGYsIGZpbGUpOgogICAgICAgICAgICAgYWxpYXNfdG9fbmFtZSA9IGRlZmF1 bHRkaWN0KGxpc3QpCkBAIC0xMTEsNiArMTE1LDggQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0 KToKICAgICAgICAgICAgIHJlc3VsdC5naXRodWIgPSBjb250cmlidXRvci5naXRodWIgb3IgcmVz dWx0LmdpdGh1YgogICAgICAgICAgICAgcmVzdWx0LmJpdGJ1Y2tldCA9IGNvbnRyaWJ1dG9yLmJp dGJ1Y2tldCBvciByZXN1bHQuYml0YnVja2V0CiAKKyAgICAgICAgICAgIHNlbGYuc3RhdHVzZXMu YWRkKHJlc3VsdC5zdGF0dXMpCisKICAgICAgICAgICAgIGlmIHJlc3VsdC5naXRodWI6CiAgICAg ICAgICAgICAgICAgc2VsZltyZXN1bHQuZ2l0aHViXSA9IHJlc3VsdAogICAgICAgICAgICAgaWYg cmVzdWx0LmJpdGJ1Y2tldDoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHkgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0YnVja2V0LnB5Cmlu ZGV4IDk2NmZlZGU1Yjg3NzNmOTc4ZTA4M2RjODM2NjhjOTVlYjA1OWY0NDcuLjJmNTBmNmI3MTA1 ZDgwZjEwNTc4MGVjMzgxMGRjODkzZjI2MGMzOTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHkKKysr IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3Rl L2JpdGJ1Y2tldC5weQpAQCAtMjUsMTAgKzI1LDggQEAgaW1wb3J0IHJlcXVlc3RzCiBpbXBvcnQg c2l4CiBpbXBvcnQgc3lzCiAKLWltcG9ydCBqc29uCi0KIGZyb20gd2Via2l0Y29yZXB5IGltcG9y dCBkZWNvcmF0b3JzCi1mcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIFB1bGxSZXF1ZXN0 Citmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIENvbnRyaWJ1dG9yLCBQdWxsUmVxdWVz dAogZnJvbSB3ZWJraXRzY21weS5yZW1vdGUuc2NtIGltcG9ydCBTY20KIAogCkBAIC01OCwxMyAr NTYsMTQgQEAgY2xhc3MgQml0QnVja2V0KFNjbSk6CiAgICAgICAgICAgICByZXN1bHQuX3Jldmll d2VycyA9IFtdCiAgICAgICAgICAgICByZXN1bHQuX2FwcHJvdmVycyA9IFtdCiAgICAgICAgICAg ICByZXN1bHQuX2Jsb2NrZXJzID0gW10KKyAgICAgICAgICAgIG5lZWRzX3N0YXR1cyA9IENvbnRy aWJ1dG9yLlJFVklFV0VSIGluIHNlbGYucmVwb3NpdG9yeS5jb250cmlidXRvcnMuc3RhdHVzZXMK ICAgICAgICAgICAgIGZvciByZGF0YSBpbiBkYXRhLmdldCgncmV2aWV3ZXJzJywgW10pOgogICAg ICAgICAgICAgICAgIHJldmlld2VyID0gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5jcmVh dGUoCiAgICAgICAgICAgICAgICAgICAgIHJkYXRhWyd1c2VyJ11bJ2Rpc3BsYXlOYW1lJ10sCiAg ICAgICAgICAgICAgICAgICAgIHJkYXRhWyd1c2VyJ10uZ2V0KCdlbWFpbEFkZHJlc3MnLCBOb25l KSwKICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICAgICAgcmVzdWx0Ll9yZXZpZXdlcnMu YXBwZW5kKHJldmlld2VyKQotICAgICAgICAgICAgICAgIGlmIHJkYXRhLmdldCgnYXBwcm92ZWQn LCBGYWxzZSk6CisgICAgICAgICAgICAgICAgaWYgcmRhdGEuZ2V0KCdhcHByb3ZlZCcsIEZhbHNl KSBhbmQgKG5vdCBuZWVkc19zdGF0dXMgb3IgcmV2aWV3ZXIuc3RhdHVzID09IENvbnRyaWJ1dG9y LlJFVklFV0VSKToKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0Ll9hcHByb3ZlcnMuYXBwZW5k KHJldmlld2VyKQogICAgICAgICAgICAgICAgIGlmIHJkYXRhLmdldCgnc3RhdHVzJykgPT0gJ05F RURTX1dPUksnOgogICAgICAgICAgICAgICAgICAgICByZXN1bHQuX2Jsb2NrZXJzLmFwcGVuZChy ZXZpZXdlcikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkKaW5kZXggNjNjNzQzMzc3 OWVlZDUwZjhlMmUyYjNlMDUzOTU4Njc5OGU5Njc3MS4uMGExMDFiMDIxZjljNWI3ZjZhYzYzZWEw MWU5NmIzMTRhNjMxNmFkMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkKQEAg LTE2Miw3ICsxNjIsNyBAQCBjbGFzcyBHaXRIdWIoU2NtKToKICAgICAgICAgICAgICAgICByZXR1 cm4gQ29udHJpYnV0b3IodXNlcm5hbWUpCiAKICAgICAgICAgICAgIGRhdGEgPSByZXNwb25zZS5q c29uKCkKLSAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYucmVwb3NpdG9yeS5jb250cmlidXRvcnMu Y3JlYXRlKGRhdGEuZ2V0KCduYW1lJywgdXNlcm5hbWUpLCBkYXRhLmdldCgnZW1haWwnKSkKKyAg ICAgICAgICAgIHJlc3VsdCA9IHNlbGYucmVwb3NpdG9yeS5jb250cmlidXRvcnMuY3JlYXRlKGRh dGEuZ2V0KCduYW1lJywgdXNlcm5hbWUpIG9yIHVzZXJuYW1lLCBkYXRhLmdldCgnZW1haWwnKSkK ICAgICAgICAgICAgIHJlc3VsdC5naXRodWIgPSB1c2VybmFtZQogICAgICAgICAgICAgc2VsZi5y ZXBvc2l0b3J5LmNvbnRyaWJ1dG9yc1t1c2VybmFtZV0gPSByZXN1bHQKICAgICAgICAgICAgIHJl dHVybiByZXN1bHQKQEAgLTE3MiwxMCArMTcyLDExIEBAIGNsYXNzIEdpdEh1YihTY20pOgogICAg ICAgICAgICAgcHVsbF9yZXF1ZXN0Ll9yZXZpZXdlcnMgPSBbc2VsZi5fY29udHJpYnV0b3IodXNl clsnbG9naW4nXSkgZm9yIHVzZXIgaW4gcmVzcG9uc2UuZ2V0KCd1c2VycycsIFtdKV0KICAgICAg ICAgICAgIHB1bGxfcmVxdWVzdC5fYXBwcm92ZXJzID0gW10KICAgICAgICAgICAgIHB1bGxfcmVx dWVzdC5fYmxvY2tlcnMgPSBbXQorICAgICAgICAgICAgbmVlZHNfc3RhdHVzID0gQ29udHJpYnV0 b3IuUkVWSUVXRVIgaW4gc2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5zdGF0dXNlcwogICAg ICAgICAgICAgZm9yIHJldmlldyBpbiBzZWxmLnJlcG9zaXRvcnkucmVxdWVzdCgncHVsbHMve30v cmV2aWV3cycuZm9ybWF0KHB1bGxfcmVxdWVzdC5udW1iZXIpKToKICAgICAgICAgICAgICAgICBj b250cmlidXRvciA9IHNlbGYuX2NvbnRyaWJ1dG9yKHJldmlld1sndXNlciddWydsb2dpbiddKQog ICAgICAgICAgICAgICAgIHB1bGxfcmVxdWVzdC5fcmV2aWV3ZXJzLmFwcGVuZChjb250cmlidXRv cikKLSAgICAgICAgICAgICAgICBpZiByZXZpZXcuZ2V0KCdzdGF0ZScpID09ICdBUFBST1ZFRCc6 CisgICAgICAgICAgICAgICAgaWYgcmV2aWV3LmdldCgnc3RhdGUnKSA9PSAnQVBQUk9WRUQnIGFu ZCAobm90IG5lZWRzX3N0YXR1cyBvciBjb250cmlidXRvci5zdGF0dXMgPT0gQ29udHJpYnV0b3Iu UkVWSUVXRVIpOgogICAgICAgICAgICAgICAgICAgICBwdWxsX3JlcXVlc3QuX2FwcHJvdmVycy5h cHBlbmQoY29udHJpYnV0b3IpCiAgICAgICAgICAgICAgICAgZWxpZiByZXZpZXcuZ2V0KCdzdGF0 ZScpID09ICdDSEFOR0VTX1JFUVVFU1RFRCc6CiAgICAgICAgICAgICAgICAgICAgIHB1bGxfcmVx dWVzdC5fYmxvY2tlcnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3Rf dW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQppbmRleCAwMTMwMzk0MDg0YTRiNTgz MmM1Y2I0ZWI2YjZlNWE0NGY4NWUyODFkLi5mOTZiZmVmMzAyNWZlOTAwMjNhZDQ5Njg3Mjg1MWNk ZGRiMDcxZjNlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVz dF91bml0dGVzdC5weQpAQCAtNDkzLDYgKzQ5MywyMiBAQCBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYXBwcm92ZXJzLCBbQ29udHJp YnV0b3IoJ0VhZ2VyIFJldmlld2VyJywgWydlcmV2aWV3ZXJAd2Via2l0Lm9yZyddKV0pCiAgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLmJsb2NrZXJzLCBbQ29udHJpYnV0b3IoJ1N1c3Bp Y2lvdXMgUmV2aWV3ZXInLCBbJ3NyZXZpZXdlckB3ZWJraXQub3JnJ10pXSkKIAorICAgIGRlZiB0 ZXN0X2FwcHJvdmVyc19zdGF0dXMoc2VsZik6CisgICAgICAgIHdpdGggc2VsZi53ZWJzZXJ2ZXIo KToKKyAgICAgICAgICAgIHJlcG8gPSByZW1vdGUuR2l0SHViKHNlbGYucmVtb3RlKQorICAgICAg ICAgICAgcmVwby5jb250cmlidXRvcnMuYWRkKENvbnRyaWJ1dG9yKAorICAgICAgICAgICAgICAg ICdTdXNwaWNpb3VzIFJldmlld2VyJywgWydzcmV2aWV3ZXJAd2Via2l0Lm9yZyddLAorICAgICAg ICAgICAgICAgIGdpdGh1Yj0nc3Jldmlld2VyJywgc3RhdHVzPUNvbnRyaWJ1dG9yLlJFVklFV0VS LAorICAgICAgICAgICAgKSkKKyAgICAgICAgICAgIHByID0gcmVwby5wdWxsX3JlcXVlc3RzLmdl dCgxKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5yZXZpZXdlcnMsIFsKKyAgICAg ICAgICAgICAgICBDb250cmlidXRvcignRWFnZXIgUmV2aWV3ZXInLCBbJ2VyZXZpZXdlckB3ZWJr aXQub3JnJ10pLAorICAgICAgICAgICAgICAgIENvbnRyaWJ1dG9yKCdSZWx1Y3RhbnQgUmV2aWV3 ZXInLCBbJ3JyZXZpZXdlckB3ZWJraXQub3JnJ10pLAorICAgICAgICAgICAgICAgIENvbnRyaWJ1 dG9yKCdTdXNwaWNpb3VzIFJldmlld2VyJywgWydzcmV2aWV3ZXJAd2Via2l0Lm9yZyddKSwKKyAg ICAgICAgICAgIF0pCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLmFwcHJvdmVycywg W10pCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLmJsb2NrZXJzLCBbQ29udHJpYnV0 b3IoJ1N1c3BpY2lvdXMgUmV2aWV3ZXInLCBbJ3NyZXZpZXdlckB3ZWJraXQub3JnJ10pXSkKKwog CiBjbGFzcyBUZXN0TmV0d29ya1B1bGxSZXF1ZXN0Qml0QnVja2V0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICByZW1vdGUgPSAnaHR0cHM6Ly9iaXRidWNrZXQuZXhhbXBsZS5jb20vcHJvamVjdHMv V0VCS0lUL3JlcG9zL3dlYmtpdCcKQEAgLTU3NCwzICs1OTAsMTkgQEAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCiAgICAgICAgICAgICBdKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChwci5hcHByb3ZlcnMsIFtDb250cmlidXRvcignRWFnZXIgUmV2aWV3ZXInLCBbJ2VyZXZpZXdl ckB3ZWJraXQub3JnJ10pXSkKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYmxvY2tl cnMsIFtDb250cmlidXRvcignU3VzcGljaW91cyBSZXZpZXdlcicsIFsnc3Jldmlld2VyQHdlYmtp dC5vcmcnXSldKQorCisgICAgZGVmIHRlc3RfYXBwcm92ZXJzX3N0YXR1cyhzZWxmKToKKyAgICAg ICAgd2l0aCBzZWxmLndlYnNlcnZlcigpOgorICAgICAgICAgICAgcmVwbyA9IHJlbW90ZS5CaXRC dWNrZXQoc2VsZi5yZW1vdGUpCisgICAgICAgICAgICByZXBvLmNvbnRyaWJ1dG9ycy5hZGQoQ29u dHJpYnV0b3IoCisgICAgICAgICAgICAgICAgJ1N1c3BpY2lvdXMgUmV2aWV3ZXInLCBbJ3NyZXZp ZXdlckB3ZWJraXQub3JnJ10sCisgICAgICAgICAgICAgICAgZ2l0aHViPSdzcmV2aWV3ZXInLCBz dGF0dXM9Q29udHJpYnV0b3IuUkVWSUVXRVIsCisgICAgICAgICAgICApKQorICAgICAgICAgICAg cHIgPSByZXBvLnB1bGxfcmVxdWVzdHMuZ2V0KDEpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHByLnJldmlld2VycywgWworICAgICAgICAgICAgICAgIENvbnRyaWJ1dG9yKCdFYWdlciBS ZXZpZXdlcicsIFsnZXJldmlld2VyQHdlYmtpdC5vcmcnXSksCisgICAgICAgICAgICAgICAgQ29u dHJpYnV0b3IoJ1JlbHVjdGFudCBSZXZpZXdlcicsIFsncnJldmlld2VyQHdlYmtpdC5vcmcnXSks CisgICAgICAgICAgICAgICAgQ29udHJpYnV0b3IoJ1N1c3BpY2lvdXMgUmV2aWV3ZXInLCBbJ3Ny ZXZpZXdlckB3ZWJraXQub3JnJ10pLAorICAgICAgICAgICAgXSkKKyAgICAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwocHIuYXBwcm92ZXJzLCBbXSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwocHIuYmxvY2tlcnMsIFtDb250cmlidXRvcignU3VzcGljaW91cyBSZXZpZXdlcicsIFsnc3Jl dmlld2VyQHdlYmtpdC5vcmcnXSldKQo=