232765 2021-11-05 13:39:52 -0700 [git-webkit] Open closed pull-request when running pr 2022-01-04 07:28:01 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard ap webkit-bug-importer oldest_to_newest 1812229 0 jbedard 2021-11-05 13:39:52 -0700 When we run `git-webkit pr`, if we match a closed pull-request, we should re-open that pull-request. 1812230 1 webkit-bug-importer 2021-11-05 13:40:12 -0700 <rdar://problem/85084318> 1812233 2 443433 jbedard 2021-11-05 13:43:51 -0700 Created attachment 443433 Patch 1812685 3 443433 ap 2021-11-08 10:33:09 -0800 Comment on attachment 443433 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443433&action=review > Tools/ChangeLog:3 > + [git-webkit] Open closed pull-request when running pr Should the script ask the user for confirmation? This is likely to be in error, so doing it unconditionally seems questionable. 1812846 4 443610 jbedard 2021-11-08 14:44:00 -0800 Created attachment 443610 Patch 1812849 5 jbedard 2021-11-08 14:49:16 -0800 (In reply to Alexey Proskuryakov from comment #3) > Comment on attachment 443433 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443433&action=review > > > Tools/ChangeLog:3 > > + [git-webkit] Open closed pull-request when running pr > > Should the script ask the user for confirmation? This is likely to be in > error, so doing it unconditionally seems questionable. Updated the patch to prompt the user if the pull-request is closed. We also need to match opened pull-requests by default if we're going to prompt users to duplicate branch names in PRs. As a side note, https://github.com/WebKit/WebKit/pull/35 is the pull-request for this change. 1814533 6 443610 jbedard 2021-11-12 11:23:59 -0800 Comment on attachment 443610 Patch Landed https://commits.webkit.org/244192@main (r 285733) 1814534 7 jbedard 2021-11-12 11:24:27 -0800 Landed https://commits.webkit.org/244192@main (r285733) 1827936 8 jbedard 2022-01-04 07:28:01 -0800 Follow-up fix: https://github.com/WebKit/WebKit/pull/60 443433 2021-11-05 13:43:51 -0700 2021-11-08 14:43:58 -0800 Patch bug-232765-20211105134350.patch text/plain 10541 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODZjNTlhYjdlYTA5OTlmMzFhMjdkMGZkZWU5MTZmYWY0 Y2I3MTZiOC4uYzFmZTgyNWQ3N2IzMzY0NjM4MDVmMTg5NmE5MzEzNjljOWY5OTZhOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIxLTExLTA1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gT3BlbiBjbG9zZWQgcHVsbC1yZXF1ZXN0IHdoZW4gcnVubmlu ZyBwcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMy NzY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NTA4NDMxOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9iaXRidWNrZXQucHk6CisgICAgICAgIChC aXRCdWNrZXQucmVxdWVzdCk6IEVuc3VyZSBkaXNwbGF5SWQgaXMgc2V0IHdoZW4gdXBkYXRpbmcg UFIuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bW9ja3MvcmVtb3RlL2dpdF9odWIucHk6CisgICAgICAgIChHaXRIdWIucmVxdWVzdCk6IE1ha2Ug c3VyZSB0aGF0IG5ldyBwdWxsLXJlcXVlc3RzIGFyZSBvcGVuLgorICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9yZXF1ZXN0LnB5 OgorICAgICAgICAoUHVsbFJlcXVlc3QubWFpbik6IE9wZW4gY2xvc2VkIHB1bGwtcmVxdWVzdHMu CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVt b3RlL2dpdF9odWIucHk6CisgICAgICAgIChHaXRIdWIuUFJHZW5lcmF0b3IudXBkYXRlKTogT25s eSBzZXQgaGVhZCBpZiB1c2VyIHNwZWNpZmllcyBoZWFkLgorICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0 LnB5OgorCiAyMDIxLTExLTA1ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgog CiAgICAgICAgIEJyaW5nIHVwIHF1ZXVlcyBmb3IgTW9udGVyZXkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9i aXRidWNrZXQucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9tb2Nrcy9yZW1vdGUvYml0YnVja2V0LnB5CmluZGV4IDIyODhlYmI0NTY0MDM0YzFjN2Q1 NmY2MmViNDA4ZmQ2Yzg2ODQxOTkuLjVhMWVhYmIyNGY2NmU2ZjA4NGVlODUwYTk0ODY1ZDIzN2U2 ODZiZWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L21vY2tzL3JlbW90ZS9iaXRidWNrZXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvcmVtb3RlL2JpdGJ1Y2tldC5w eQpAQCAtMjIxLDggKzIyMSw4IEBAIGNsYXNzIEJpdEJ1Y2tldChtb2Nrcy5SZXF1ZXN0cyk6CiAg ICAgICAgICAgICBqc29uWydhdXRob3InXSA9IGRpY3QodXNlcj1kaWN0KGRpc3BsYXlOYW1lPSdU aW0gQ29tbWl0dGVyJywgZW1haWxBZGRyZXNzPSdjb21taXR0ZXJAd2Via2l0Lm9yZycpKQogICAg ICAgICAgICAganNvblsncGFydGljaXBhbnRzJ10gPSBbanNvblsnYXV0aG9yJ11dCiAgICAgICAg ICAgICBqc29uWydpZCddID0gMSArIG1heChbMF0gKyBbcHIuZ2V0KCdpZCcsIDApIGZvciBwciBp biBzZWxmLnB1bGxfcmVxdWVzdHNdKQotICAgICAgICAgICAganNvblsnZnJvbVJlZiddWydkaXNw bGF5SWQnXSA9IGpzb25bJ2Zyb21SZWYnXVsnaWQnXS5zcGxpdCgnLycpWy0yOl0KLSAgICAgICAg ICAgIGpzb25bJ3RvUmVmJ11bJ2Rpc3BsYXlJZCddID0ganNvblsndG9SZWYnXVsnaWQnXS5zcGxp dCgnLycpWy0yOl0KKyAgICAgICAgICAgIGpzb25bJ2Zyb21SZWYnXVsnZGlzcGxheUlkJ10gPSAn Lycuam9pbihqc29uWydmcm9tUmVmJ11bJ2lkJ10uc3BsaXQoJy8nKVstMjpdKQorICAgICAgICAg ICAganNvblsndG9SZWYnXVsnZGlzcGxheUlkJ10gPSAnLycuam9pbihqc29uWyd0b1JlZiddWydp ZCddLnNwbGl0KCcvJylbLTI6XSkKICAgICAgICAgICAgIGpzb25bJ3N0YXRlJ10gPSAnT1BFTicK ICAgICAgICAgICAgIGpzb25bJ2FjdGl2aXRpZXMnXSA9IFtdCiAgICAgICAgICAgICBzZWxmLnB1 bGxfcmVxdWVzdHMuYXBwZW5kKGpzb24pCkBAIC0yNDAsNiArMjQwLDggQEAgY2xhc3MgQml0QnVj a2V0KG1vY2tzLlJlcXVlc3RzKToKICAgICAgICAgICAgICAgICByZXR1cm4gbW9ja3MuUmVzcG9u c2UuY3JlYXRlNDA0KHVybCkKICAgICAgICAgICAgIGlmIG1ldGhvZCA9PSAnUFVUJzoKICAgICAg ICAgICAgICAgICBzZWxmLnB1bGxfcmVxdWVzdHNbZXhpc3RpbmddLnVwZGF0ZShqc29uKQorICAg ICAgICAgICAgICAgIHNlbGYucHVsbF9yZXF1ZXN0c1tleGlzdGluZ11bJ2Zyb21SZWYnXVsnZGlz cGxheUlkJ10gPSAnLycuam9pbihqc29uWydmcm9tUmVmJ11bJ2lkJ10uc3BsaXQoJy8nKVstMjpd KQorICAgICAgICAgICAgICAgIHNlbGYucHVsbF9yZXF1ZXN0c1tleGlzdGluZ11bJ3RvUmVmJ11b J2Rpc3BsYXlJZCddID0gJy8nLmpvaW4oanNvblsndG9SZWYnXVsnaWQnXS5zcGxpdCgnLycpWy0y Ol0pCiAgICAgICAgICAgICBpZiBsZW4oc3BsaXRfdXJsKSA8IDExOgogICAgICAgICAgICAgICAg IHJldHVybiBtb2Nrcy5SZXNwb25zZS5mcm9tSnNvbih7a2V5OiB2YWx1ZSBmb3Iga2V5LCB2YWx1 ZSBpbiBzZWxmLnB1bGxfcmVxdWVzdHNbZXhpc3RpbmddLml0ZW1zKCkgaWYga2V5ICE9ICdhY3Rp dml0aWVzJ30pCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9naXRfaHViLnB5IGIvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvcmVtb3RlL2dpdF9odWIucHkK aW5kZXggODk0YmM4NzlkY2E3MjA1Yzg2MzAxMTMxMGVkZWQ1ZDg0NGMwZjAxZC4uYjUwM2Q3MWY3 MDU4OTYwMWU4NTJhZWY0ZGIwZmI3Mjg4YmI2ZDZkZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvcmVtb3RlL2dpdF9odWIu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bW9ja3MvcmVtb3RlL2dpdF9odWIucHkKQEAgLTQwOCw2ICs0MDgsNyBAQCBjbGFzcyBHaXRIdWIo bW9ja3MuUmVxdWVzdHMpOgogICAgICAgICAjIENyZWF0ZSBzcGVjaWZpY2FsbHkKICAgICAgICAg aWYgbWV0aG9kID09ICdQT1NUJyBhbmQgYXV0aCBhbmQgc3RyaXBwZWRfdXJsID09IHByX2Jhc2U6 CiAgICAgICAgICAgICBwclsnbnVtYmVyJ10gPSAxICsgbWF4KFswXSArIFtwci5nZXQoJ251bWJl cicsIDApIGZvciBwciBpbiBzZWxmLnB1bGxfcmVxdWVzdHNdKQorICAgICAgICAgICAgcHJbJ3N0 YXRlJ10gPSAnb3BlbicKICAgICAgICAgICAgIHByWyd1c2VyJ10gPSBkaWN0KGxvZ2luPWF1dGgu dXNlcm5hbWUpCiAgICAgICAgICAgICBwclsnX2xpbmtzJ10gPSBkaWN0KGlzc3VlPWRpY3QoaHJl Zj0naHR0cHM6Ly97fS9pc3N1ZXMve30nLmZvcm1hdChzZWxmLmFwaV9yZW1vdGUsIHByWydudW1i ZXInXSkpKQogICAgICAgICAgICAgc2VsZi5wdWxsX3JlcXVlc3RzLmFwcGVuZChwcikKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3By b2dyYW0vcHVsbF9yZXF1ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKaW5kZXggY2I4ZjJkMjU4ODY0 N2JiMTljZDRjM2RjZDg3YzJlZTE4MzA2NTU0MS4uZDhkODVmYzRhZTg5ZmQ2OWRjZjM2NjczMjI2 ZjUyZjhkYTJkZDljNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVl c3QucHkKQEAgLTE0MSw2ICsxNDEsNyBAQCBjbGFzcyBQdWxsUmVxdWVzdChDb21tYW5kKToKICAg ICAgICAgICAgICAgICBjb21taXRzPWNvbW1pdHMsCiAgICAgICAgICAgICAgICAgYmFzZT1icmFu Y2hfcG9pbnQuYnJhbmNoLAogICAgICAgICAgICAgICAgIGhlYWQ9cmVwb3NpdG9yeS5icmFuY2gs CisgICAgICAgICAgICAgICAgb3BlbmVkPU5vbmUgaWYgY2FuZGlkYXRlc1swXS5vcGVuZWQgZWxz ZSBUcnVlCiAgICAgICAgICAgICApCiAgICAgICAgICAgICBpZiBub3QgcHI6CiAgICAgICAgICAg ICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIHVwZGF0ZSBwdWxsLXJlcXVlc3QgJ3t9 J1xuIi5mb3JtYXQoY2FuZGlkYXRlc1swXSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weSBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHVi LnB5CmluZGV4IGM4NDczYTYyZDA4M2NhOTA5MDU2MGFlZGJlYTI0Y2Q1NzY3MGU3YjAuLjQxYzk0 ZTRmMGE5NzA5NDAzMWZiZTM4OGE3YmI1Y2RkMjJiNzc5NGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Jl bW90ZS9naXRfaHViLnB5CkBAIC0xMjcsOCArMTI3LDkgQEAgY2xhc3MgR2l0SHViKFNjbSk6CiAg ICAgICAgICAgICB1cGRhdGVzID0gZGljdCgKICAgICAgICAgICAgICAgICB0aXRsZT10aXRsZSBv ciBwdWxsX3JlcXVlc3QudGl0bGUsCiAgICAgICAgICAgICAgICAgYmFzZT1iYXNlIG9yIHB1bGxf cmVxdWVzdC5iYXNlLAotICAgICAgICAgICAgICAgIGhlYWQ9J3t9Ont9Jy5mb3JtYXQodXNlciwg aGVhZCkgaWYgaGVhZCBlbHNlIHB1bGxfcmVxdWVzdC5oZWFkLAogICAgICAgICAgICAgKQorICAg ICAgICAgICAgaWYgaGVhZDoKKyAgICAgICAgICAgICAgICB1cGRhdGVzWydoZWFkJ10gPSAne306 e30nLmZvcm1hdCh1c2VyLCBoZWFkKQogICAgICAgICAgICAgaWYgYm9keSBvciBjb21taXRzOgog ICAgICAgICAgICAgICAgIHVwZGF0ZXNbJ2JvZHknXSA9IFB1bGxSZXF1ZXN0LmNyZWF0ZV9ib2R5 KGJvZHksIGNvbW1pdHMpCiAgICAgICAgICAgICBpZiBvcGVuZWQgaXMgbm90IE5vbmU6CmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90 ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CmluZGV4 IDE0Y2E3Yzc5Y2NkOTM3MmJlOWU5Y2IyOTIwMzQ2Y2FkNTEwYjYwNzMuLjYwNTViZWVlZWM2NDI4 ZmJkYjNiOGNlYzlkNzE5NDU4NGUxMDAwYjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CkBAIC0yNSw3ICsyNSw3IEBAIGltcG9ydCBz eXMKIGltcG9ydCB1bml0dGVzdAogCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgT3V0cHV0Q2Fw dHVyZSwgdGVzdGluZwotZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgQ29udHJpYnV0b3IsIENvbW1p dCwgUHVsbFJlcXVlc3QsIHByb2dyYW0sIG1vY2tzLCByZW1vdGUKK2Zyb20gd2Via2l0c2NtcHkg aW1wb3J0IENvbnRyaWJ1dG9yLCBDb21taXQsIFB1bGxSZXF1ZXN0LCBsb2NhbCwgcHJvZ3JhbSwg bW9ja3MsIHJlbW90ZQogCiAKIGNsYXNzIFRlc3RQdWxsUmVxdWVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CkBAIC0xNDUsNyArMTQ1LDYgQEAgUmV2aWV3ZWQgYnkgVGltIENvbnRyaWJ1dG9yLgogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHNbMV0ubWVzc2FnZSwgJ1tzY29waW5nXSBCdWcg dG8gZml4IChQYXJ0IDEpXG5cblJldmlld2VkIGJ5IFRpbSBDb250cmlidXRvci4nKQogCiAgICAg ZGVmIHRlc3RfcGFyc2VfaHRtbF9ib2R5X211bHRpcGxlKHNlbGYpOgotICAgICAgICBzZWxmLm1h eERpZmYgPSBOb25lCiAgICAgICAgIGJvZHksIGNvbW1pdHMgPSBQdWxsUmVxdWVzdC5wYXJzZV9i b2R5KCcnJyMjIyMgMTFhYTc2ZjlmYzM4MGU5ZmUwNjE1NzE1NGYzMmIzMDRlOGRjNDc0OQogPHBy ZT4KIFtzY29waW5nXSBCdWcgdG8gZml4IChQYXJ0IDIpCkBAIC0zNTgsNyArMzU3LDQyIEBAIFJl YmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluIScKIAogICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGNhcHR1cmVkLnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKICAgICAgICAgbG9nID0gY2FwdHVy ZWQucm9vdC5sb2cuZ2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKLSAgICAgICAgc2VsZi5tYXhEaWZm ID0gTm9uZQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAgICAgICAgW2xpbmUgZm9y IGxpbmUgaW4gbG9nIGlmICdNb2NrIHByb2Nlc3MnIG5vdCBpbiBsaW5lXSwgWworICAgICAgICAg ICAgICAgICJBbWVuZGluZyBjb21taXQuLi4iLAorICAgICAgICAgICAgICAgICcgICAgRm91bmQg MSBjb21taXQuLi4nLAorICAgICAgICAgICAgICAgICJSZWJhc2luZyAnZW5nL3ByLWJyYW5jaCcg b24gJ21haW4nLi4uIiwKKyAgICAgICAgICAgICAgICAiUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcg b24gJ21haW4hJyIsCisgICAgICAgICAgICAgICAgIiAgICBGb3VuZCAxIGNvbW1pdC4uLiIsCisg ICAgICAgICAgICAgICAgIlB1c2hpbmcgJ2VuZy9wci1icmFuY2gnIHRvICdmb3JrJy4uLiIsCisg ICAgICAgICAgICAgICAgIlVwZGF0aW5nIHB1bGwtcmVxdWVzdCBmb3IgJ2VuZy9wci1icmFuY2gn Li4uIiwKKyAgICAgICAgICAgICAgICAiVXBkYXRlZCAnUFIgMSB8IEFtZW5kZWQgY29tbWl0JyEi LAorICAgICAgICAgICAgXSwKKyAgICAgICAgKQorCisgICAgZGVmIHRlc3RfZ2l0aHViX3Jlb3Bl bihzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuR2l0SHViKCkgYXMgcmVtb3RlLCBt b2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCByZW1vdGU9J2h0dHBzOi8ve30nLmZvcm1hdChyZW1v dGUucmVtb3RlKSkgYXMgcmVwbywgbW9ja3MubG9jYWwuU3ZuKCk6CisgICAgICAgICAgICB3aXRo IE91dHB1dENhcHR1cmUoKToKKyAgICAgICAgICAgICAgICByZXBvLnN0YWdlZFsnYWRkZWQudHh0 J10gPSAnYWRkZWQnCisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgwLCBwcm9ncmFt Lm1haW4oCisgICAgICAgICAgICAgICAgICAgIGFyZ3M9KCdwdWxsLXJlcXVlc3QnLCAnLWknLCAn cHItYnJhbmNoJyksCisgICAgICAgICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAorICAgICAg ICAgICAgICAgICkpCisKKyAgICAgICAgICAgIGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgp LnB1bGxfcmVxdWVzdHMuZ2V0KDEpLmNsb3NlKCkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFs c2UobG9jYWwuR2l0KHNlbGYucGF0aCkucmVtb3RlKCkucHVsbF9yZXF1ZXN0cy5nZXQoMSkub3Bl bmVkKQorCisgICAgICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoKKyAg ICAgICAgICAgICAgICByZXBvLnN0YWdlZFsnYWRkZWQudHh0J10gPSAnZGlmZicKKyAgICAgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFpbigKKyAgICAgICAgICAgICAg ICAgICAgYXJncz0oJ3B1bGwtcmVxdWVzdCcsKSwKKyAgICAgICAgICAgICAgICAgICAgcGF0aD1z ZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgKSkKKworICAgICAgICAgICAgc2VsZi5hc3NlcnRU cnVlKGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLnB1bGxfcmVxdWVzdHMuZ2V0KDEpLm9w ZW5lZCkKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZGVyci5nZXR2YWx1 ZSgpLCAnJykKKyAgICAgICAgbG9nID0gY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUoKS5zcGxp dGxpbmVzKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKICAgICAgICAgICAgIFtsaW5lIGZv ciBsaW5lIGluIGxvZyBpZiAnTW9jayBwcm9jZXNzJyBub3QgaW4gbGluZV0sIFsKICAgICAgICAg ICAgICAgICAiQW1lbmRpbmcgY29tbWl0Li4uIiwKQEAgLTQzMiw2ICs0NjYsNDQgQEAgUmViYXNl ZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJwogICAgICAgICAgICAgXSwKICAgICAgICAgKQog CisgICAgZGVmIHRlc3RfYml0YnVja2V0X3Jlb3BlbihzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nr cy5yZW1vdGUuQml0QnVja2V0KCkgYXMgcmVtb3RlLCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRo LCByZW1vdGU9J3NzaDovL2dpdEB7fS97fS97fS5naXQnLmZvcm1hdCgKKyAgICAgICAgICAgIHJl bW90ZS5ob3N0c1swXSwgcmVtb3RlLnByb2plY3Quc3BsaXQoJy8nKVsxXSwgcmVtb3RlLnByb2pl Y3Quc3BsaXQoJy8nKVszXSwKKyAgICAgICAgKSkgYXMgcmVwbywgbW9ja3MubG9jYWwuU3ZuKCk6 CisgICAgICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKToKKyAgICAgICAgICAgICAgICByZXBv LnN0YWdlZFsnYWRkZWQudHh0J10gPSAnYWRkZWQnCisgICAgICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbCgwLCBwcm9ncmFtLm1haW4oCisgICAgICAgICAgICAgICAgICAgIGFyZ3M9KCdwdWxs LXJlcXVlc3QnLCAnLWknLCAncHItYnJhbmNoJyksCisgICAgICAgICAgICAgICAgICAgIHBhdGg9 c2VsZi5wYXRoLAorICAgICAgICAgICAgICAgICkpCisKKyAgICAgICAgICAgIGxvY2FsLkdpdChz ZWxmLnBhdGgpLnJlbW90ZSgpLnB1bGxfcmVxdWVzdHMuZ2V0KDEpLmNsb3NlKCkKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2UobG9jYWwuR2l0KHNlbGYucGF0aCkucmVtb3RlKCkucHVsbF9y ZXF1ZXN0cy5nZXQoMSkub3BlbmVkKQorCisgICAgICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUo KSBhcyBjYXB0dXJlZDoKKyAgICAgICAgICAgICAgICByZXBvLnN0YWdlZFsnYWRkZWQudHh0J10g PSAnZGlmZicKKyAgICAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFp bigKKyAgICAgICAgICAgICAgICAgICAgYXJncz0oJ3B1bGwtcmVxdWVzdCcsKSwKKyAgICAgICAg ICAgICAgICAgICAgcGF0aD1zZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgKSkKKworICAgICAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLnB1bGxf cmVxdWVzdHMuZ2V0KDEpLm9wZW5lZCkKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1 cmVkLnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKKyAgICAgICAgbG9nID0gY2FwdHVyZWQucm9vdC5s b2cuZ2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAg ICAgICAgICAgIFtsaW5lIGZvciBsaW5lIGluIGxvZyBpZiAnTW9jayBwcm9jZXNzJyBub3QgaW4g bGluZV0sIFsKKyAgICAgICAgICAgICAgICAiQW1lbmRpbmcgY29tbWl0Li4uIiwKKyAgICAgICAg ICAgICAgICAnICAgIEZvdW5kIDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAgICAiUmViYXNp bmcgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAgICAgIlJlYmFz ZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluISciLAorICAgICAgICAgICAgICAgICIgICAgRm91 bmQgMSBjb21taXQuLi4iLAorICAgICAgICAgICAgICAgICJQdXNoaW5nICdlbmcvcHItYnJhbmNo JyB0byAnb3JpZ2luJy4uLiIsCisgICAgICAgICAgICAgICAgIlVwZGF0aW5nIHB1bGwtcmVxdWVz dCBmb3IgJ2VuZy9wci1icmFuY2gnLi4uIiwKKyAgICAgICAgICAgICAgICAiVXBkYXRlZCAnUFIg MSB8IEFtZW5kZWQgY29tbWl0JyEiLAorICAgICAgICAgICAgXSwKKyAgICAgICAgKQorCiAKIGNs YXNzIFRlc3ROZXR3b3JrUHVsbFJlcXVlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2UpOgogICAg IHJlbW90ZSA9ICdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0Jwo= 443610 2021-11-08 14:44:00 -0800 2021-11-12 11:23:59 -0800 Patch bug-232765-20211108144359.patch text/plain 12638 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDhmMWU3Yzk3MTM5MzdiMmY0MmVlNDgyZjI1NjAxZGRm MzNjNzVlZS4uZjIxYjIxYmI4NDRkOTAwMGRmNDY3NjVhYmUzYzkwYTdjMmJkMmIwYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIxLTExLTA1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gT3BlbiBjbG9zZWQgcHVsbC1yZXF1ZXN0IHdoZW4gcnVubmlu ZyBwcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMy NzY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NTA4NDMxOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9iaXRidWNrZXQucHk6CisgICAgICAgIChC aXRCdWNrZXQucmVxdWVzdCk6IEVuc3VyZSBkaXNwbGF5SWQgaXMgc2V0IHdoZW4gdXBkYXRpbmcg UFIuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bW9ja3MvcmVtb3RlL2dpdF9odWIucHk6CisgICAgICAgIChHaXRIdWIucmVxdWVzdCk6IE1ha2Ug c3VyZSB0aGF0IG5ldyBwdWxsLXJlcXVlc3RzIGFyZSBvcGVuLgorICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9yZXF1ZXN0LnB5 OgorICAgICAgICAoUHVsbFJlcXVlc3QubWFpbik6IE9wZW4gY2xvc2VkIHB1bGwtcmVxdWVzdHMu CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVt b3RlL2dpdF9odWIucHk6CisgICAgICAgIChHaXRIdWIuUFJHZW5lcmF0b3IudXBkYXRlKTogT25s eSBzZXQgaGVhZCBpZiB1c2VyIHNwZWNpZmllcyBoZWFkLgorICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0 LnB5OgorCiAyMDIxLTExLTA4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAog ICAgICAgICB3ZWJWaWV3LnNjcm9sbFZpZXcuaW5kaWNhdG9yU3R5bGUgZG9lcyBub3Qgd29yayBv biBpT1MgMTUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9iaXRidWNrZXQucHkgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9yZW1vdGUvYml0YnVja2V0LnB5 CmluZGV4IDIyODhlYmI0NTY0MDM0YzFjN2Q1NmY2MmViNDA4ZmQ2Yzg2ODQxOTkuLjVhMWVhYmIy NGY2NmU2ZjA4NGVlODUwYTk0ODY1ZDIzN2U2ODZiZWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9iaXRidWNr ZXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvbW9ja3MvcmVtb3RlL2JpdGJ1Y2tldC5weQpAQCAtMjIxLDggKzIyMSw4IEBAIGNsYXNzIEJp dEJ1Y2tldChtb2Nrcy5SZXF1ZXN0cyk6CiAgICAgICAgICAgICBqc29uWydhdXRob3InXSA9IGRp Y3QodXNlcj1kaWN0KGRpc3BsYXlOYW1lPSdUaW0gQ29tbWl0dGVyJywgZW1haWxBZGRyZXNzPSdj b21taXR0ZXJAd2Via2l0Lm9yZycpKQogICAgICAgICAgICAganNvblsncGFydGljaXBhbnRzJ10g PSBbanNvblsnYXV0aG9yJ11dCiAgICAgICAgICAgICBqc29uWydpZCddID0gMSArIG1heChbMF0g KyBbcHIuZ2V0KCdpZCcsIDApIGZvciBwciBpbiBzZWxmLnB1bGxfcmVxdWVzdHNdKQotICAgICAg ICAgICAganNvblsnZnJvbVJlZiddWydkaXNwbGF5SWQnXSA9IGpzb25bJ2Zyb21SZWYnXVsnaWQn XS5zcGxpdCgnLycpWy0yOl0KLSAgICAgICAgICAgIGpzb25bJ3RvUmVmJ11bJ2Rpc3BsYXlJZCdd ID0ganNvblsndG9SZWYnXVsnaWQnXS5zcGxpdCgnLycpWy0yOl0KKyAgICAgICAgICAgIGpzb25b J2Zyb21SZWYnXVsnZGlzcGxheUlkJ10gPSAnLycuam9pbihqc29uWydmcm9tUmVmJ11bJ2lkJ10u c3BsaXQoJy8nKVstMjpdKQorICAgICAgICAgICAganNvblsndG9SZWYnXVsnZGlzcGxheUlkJ10g PSAnLycuam9pbihqc29uWyd0b1JlZiddWydpZCddLnNwbGl0KCcvJylbLTI6XSkKICAgICAgICAg ICAgIGpzb25bJ3N0YXRlJ10gPSAnT1BFTicKICAgICAgICAgICAgIGpzb25bJ2FjdGl2aXRpZXMn XSA9IFtdCiAgICAgICAgICAgICBzZWxmLnB1bGxfcmVxdWVzdHMuYXBwZW5kKGpzb24pCkBAIC0y NDAsNiArMjQwLDggQEAgY2xhc3MgQml0QnVja2V0KG1vY2tzLlJlcXVlc3RzKToKICAgICAgICAg ICAgICAgICByZXR1cm4gbW9ja3MuUmVzcG9uc2UuY3JlYXRlNDA0KHVybCkKICAgICAgICAgICAg IGlmIG1ldGhvZCA9PSAnUFVUJzoKICAgICAgICAgICAgICAgICBzZWxmLnB1bGxfcmVxdWVzdHNb ZXhpc3RpbmddLnVwZGF0ZShqc29uKQorICAgICAgICAgICAgICAgIHNlbGYucHVsbF9yZXF1ZXN0 c1tleGlzdGluZ11bJ2Zyb21SZWYnXVsnZGlzcGxheUlkJ10gPSAnLycuam9pbihqc29uWydmcm9t UmVmJ11bJ2lkJ10uc3BsaXQoJy8nKVstMjpdKQorICAgICAgICAgICAgICAgIHNlbGYucHVsbF9y ZXF1ZXN0c1tleGlzdGluZ11bJ3RvUmVmJ11bJ2Rpc3BsYXlJZCddID0gJy8nLmpvaW4oanNvblsn dG9SZWYnXVsnaWQnXS5zcGxpdCgnLycpWy0yOl0pCiAgICAgICAgICAgICBpZiBsZW4oc3BsaXRf dXJsKSA8IDExOgogICAgICAgICAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNwb25zZS5mcm9tSnNv bih7a2V5OiB2YWx1ZSBmb3Iga2V5LCB2YWx1ZSBpbiBzZWxmLnB1bGxfcmVxdWVzdHNbZXhpc3Rp bmddLml0ZW1zKCkgaWYga2V5ICE9ICdhY3Rpdml0aWVzJ30pCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9n aXRfaHViLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvbW9ja3MvcmVtb3RlL2dpdF9odWIucHkKaW5kZXggODk0YmM4NzlkY2E3MjA1Yzg2MzAxMTMx MGVkZWQ1ZDg0NGMwZjAxZC4uYjUwM2Q3MWY3MDU4OTYwMWU4NTJhZWY0ZGIwZmI3Mjg4YmI2ZDZk ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbW9ja3MvcmVtb3RlL2dpdF9odWIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvcmVtb3RlL2dpdF9odWIucHkKQEAgLTQw OCw2ICs0MDgsNyBAQCBjbGFzcyBHaXRIdWIobW9ja3MuUmVxdWVzdHMpOgogICAgICAgICAjIENy ZWF0ZSBzcGVjaWZpY2FsbHkKICAgICAgICAgaWYgbWV0aG9kID09ICdQT1NUJyBhbmQgYXV0aCBh bmQgc3RyaXBwZWRfdXJsID09IHByX2Jhc2U6CiAgICAgICAgICAgICBwclsnbnVtYmVyJ10gPSAx ICsgbWF4KFswXSArIFtwci5nZXQoJ251bWJlcicsIDApIGZvciBwciBpbiBzZWxmLnB1bGxfcmVx dWVzdHNdKQorICAgICAgICAgICAgcHJbJ3N0YXRlJ10gPSAnb3BlbicKICAgICAgICAgICAgIHBy Wyd1c2VyJ10gPSBkaWN0KGxvZ2luPWF1dGgudXNlcm5hbWUpCiAgICAgICAgICAgICBwclsnX2xp bmtzJ10gPSBkaWN0KGlzc3VlPWRpY3QoaHJlZj0naHR0cHM6Ly97fS9pc3N1ZXMve30nLmZvcm1h dChzZWxmLmFwaV9yZW1vdGUsIHByWydudW1iZXInXSkpKQogICAgICAgICAgICAgc2VsZi5wdWxs X3JlcXVlc3RzLmFwcGVuZChwcikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9yZXF1ZXN0LnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3Jl cXVlc3QucHkKaW5kZXggY2I4ZjJkMjU4ODY0N2JiMTljZDRjM2RjZDg3YzJlZTE4MzA2NTU0MS4u MWZhN2U4OTM4NDFhNDg2OGI2MGNkY2I0YjExZjI3ODAzY2IyZmZiNCAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxs X3JlcXVlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKQEAgLTI2LDcgKzI2LDcgQEAgaW1wb3J0 IHN5cwogZnJvbSAuY29tbWFuZCBpbXBvcnQgQ29tbWFuZAogZnJvbSAuYnJhbmNoIGltcG9ydCBC cmFuY2gKIAotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGFyZ3VtZW50cywgcnVuCitmcm9tIHdl YmtpdGNvcmVweSBpbXBvcnQgYXJndW1lbnRzLCBydW4sIFRlcm1pbmFsCiBmcm9tIHdlYmtpdHNj bXB5IGltcG9ydCBsb2NhbCwgbG9nLCByZW1vdGUKIAogCkBAIC01MCw2ICs1MCwxMCBAQCBjbGFz cyBQdWxsUmVxdWVzdChDb21tYW5kKToKICAgICAgICAgICAgIGhlbHA9J1JlYmFzZSAob3IgZG8g bm90IHJlYmFzZSkgdGhlIHB1bGwtcmVxdWVzdCBvbiB0aGUgc291cmNlIGJyYW5jaCBiZWZvcmUg cHVzaGluZycsCiAgICAgICAgICAgICBhY3Rpb249YXJndW1lbnRzLk5vQWN0aW9uLAogICAgICAg ICApCisgICAgICAgIHBhcnNlci5hZGRfYXJndW1lbnQoCisgICAgICAgICAgICAnLS1kZWZhdWx0 cycsICctLW5vLWRlZmF1bHRzJywgYWN0aW9uPWFyZ3VtZW50cy5Ob0FjdGlvbiwgZGVmYXVsdD1O b25lLAorICAgICAgICAgICAgaGVscD0nRG8gbm90IHByb21wdCB0aGUgdXNlciBmb3IgZGVmYXVs dHMsIGFsd2F5cyB1c2UgKG9yIGRvIG5vdCB1c2UpIHRoZW0nLAorICAgICAgICApCiAKICAgICBA Y2xhc3NtZXRob2QKICAgICBkZWYgY3JlYXRlX2NvbW1pdChjbHMsIGFyZ3MsIHJlcG9zaXRvcnks ICoqa3dhcmdzKToKQEAgLTEzMCwxNyArMTM0LDI4IEBAIGNsYXNzIFB1bGxSZXF1ZXN0KENvbW1h bmQpOgogICAgICAgICBpZiBub3Qgcm10LnB1bGxfcmVxdWVzdHM6CiAgICAgICAgICAgICBzeXMu c3RkZXJyLndyaXRlKCIne30nIGNhbm5vdCBnZW5lcmF0ZSBwdWxsLXJlcXVlc3RzXG4iLmZvcm1h dChybXQudXJsKSkKICAgICAgICAgICAgIHJldHVybiAxCi0gICAgICAgIGNhbmRpZGF0ZXMgPSBs aXN0KHJtdC5wdWxsX3JlcXVlc3RzLmZpbmQob3BlbmVkPU5vbmUsIGhlYWQ9cmVwb3NpdG9yeS5i cmFuY2gpKQorICAgICAgICBleGlzdGluZ19wciA9IE5vbmUKKyAgICAgICAgZm9yIHByIGluIHJt dC5wdWxsX3JlcXVlc3RzLmZpbmQob3BlbmVkPU5vbmUsIGhlYWQ9cmVwb3NpdG9yeS5icmFuY2gp OgorICAgICAgICAgICAgZXhpc3RpbmdfcHIgPSBwcgorICAgICAgICAgICAgaWYgZXhpc3Rpbmdf cHIub3BlbmVkOgorICAgICAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgIGlmIGV4aXN0aW5n X3ByIGFuZCBub3QgZXhpc3RpbmdfcHIub3BlbmVkIGFuZCBub3QgYXJncy5kZWZhdWx0cyBhbmQg KGFyZ3MuZGVmYXVsdHMgaXMgRmFsc2Ugb3IgVGVybWluYWwuY2hvb3NlKAorICAgICAgICAgICAg Iid7fScgaXMgYWxyZWFkeSBhc3NvY2lhdGVkIHdpdGggJ3t9Jywgd2hpY2ggaXMgY2xvc2VkLlxu V291bGQgeW91IGxpa2UgdG8gY3JlYXRlIGEgbmV3IHB1bGwtcmVxdWVzdD8iLmZvcm1hdCgKKyAg ICAgICAgICAgICAgICByZXBvc2l0b3J5LmJyYW5jaCwgZXhpc3RpbmdfcHIsCisgICAgICAgICAg ICApLCBkZWZhdWx0PSdObycsCisgICAgICAgICkgPT0gJ1llcycpOgorICAgICAgICAgICAgZXhp c3RpbmdfcHIgPSBOb25lCiAgICAgICAgIGNvbW1pdHMgPSBsaXN0KHJlcG9zaXRvcnkuY29tbWl0 cyhiZWdpbj1kaWN0KGhhc2g9YnJhbmNoX3BvaW50Lmhhc2gpLCBlbmQ9ZGljdChicmFuY2g9cmVw b3NpdG9yeS5icmFuY2gpKSkKIAotICAgICAgICBpZiBjYW5kaWRhdGVzOgorICAgICAgICBpZiBl eGlzdGluZ19wcjoKICAgICAgICAgICAgIGxvZy53YXJuaW5nKCJVcGRhdGluZyBwdWxsLXJlcXVl c3QgZm9yICd7fScuLi4iLmZvcm1hdChyZXBvc2l0b3J5LmJyYW5jaCkpCiAgICAgICAgICAgICBw ciA9IHJtdC5wdWxsX3JlcXVlc3RzLnVwZGF0ZSgKLSAgICAgICAgICAgICAgICBwdWxsX3JlcXVl c3Q9Y2FuZGlkYXRlc1swXSwKKyAgICAgICAgICAgICAgICBwdWxsX3JlcXVlc3Q9ZXhpc3Rpbmdf cHIsCiAgICAgICAgICAgICAgICAgdGl0bGU9Y2xzLnRpdGxlX2Zvcihjb21taXRzKSwKICAgICAg ICAgICAgICAgICBjb21taXRzPWNvbW1pdHMsCiAgICAgICAgICAgICAgICAgYmFzZT1icmFuY2hf cG9pbnQuYnJhbmNoLAogICAgICAgICAgICAgICAgIGhlYWQ9cmVwb3NpdG9yeS5icmFuY2gsCisg ICAgICAgICAgICAgICAgb3BlbmVkPU5vbmUgaWYgZXhpc3RpbmdfcHIub3BlbmVkIGVsc2UgVHJ1 ZQogICAgICAgICAgICAgKQogICAgICAgICAgICAgaWYgbm90IHByOgogICAgICAgICAgICAgICAg IHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byB1cGRhdGUgcHVsbC1yZXF1ZXN0ICd7fSdcbiIu Zm9ybWF0KGNhbmRpZGF0ZXNbMF0pKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkgYi9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQpp bmRleCBjODQ3M2E2MmQwODNjYTkwOTA1NjBhZWRiZWEyNGNkNTc2NzBlN2IwLi40MWM5NGU0ZjBh OTcwOTQwMzFmYmUzODhhN2JiNWNkZDIyYjc3OTRkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQorKysg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUv Z2l0X2h1Yi5weQpAQCAtMTI3LDggKzEyNyw5IEBAIGNsYXNzIEdpdEh1YihTY20pOgogICAgICAg ICAgICAgdXBkYXRlcyA9IGRpY3QoCiAgICAgICAgICAgICAgICAgdGl0bGU9dGl0bGUgb3IgcHVs bF9yZXF1ZXN0LnRpdGxlLAogICAgICAgICAgICAgICAgIGJhc2U9YmFzZSBvciBwdWxsX3JlcXVl c3QuYmFzZSwKLSAgICAgICAgICAgICAgICBoZWFkPSd7fTp7fScuZm9ybWF0KHVzZXIsIGhlYWQp IGlmIGhlYWQgZWxzZSBwdWxsX3JlcXVlc3QuaGVhZCwKICAgICAgICAgICAgICkKKyAgICAgICAg ICAgIGlmIGhlYWQ6CisgICAgICAgICAgICAgICAgdXBkYXRlc1snaGVhZCddID0gJ3t9Ont9Jy5m b3JtYXQodXNlciwgaGVhZCkKICAgICAgICAgICAgIGlmIGJvZHkgb3IgY29tbWl0czoKICAgICAg ICAgICAgICAgICB1cGRhdGVzWydib2R5J10gPSBQdWxsUmVxdWVzdC5jcmVhdGVfYm9keShib2R5 LCBjb21taXRzKQogICAgICAgICAgICAgaWYgb3BlbmVkIGlzIG5vdCBOb25lOgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9w dWxsX3JlcXVlc3RfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQppbmRleCAxNGNh N2M3OWNjZDkzNzJiZTllOWNiMjkyMDM0NmNhZDUxMGI2MDczLi5jMWIzOTI1Y2UyMDU3MDNmNWRh NWYzZDMyNjEzY2U4Y2I3OGExNTI0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQpAQCAtMjUsNyArMjUsOCBAQCBpbXBvcnQgc3lzCiBp bXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUs IHRlc3RpbmcKLWZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbnRyaWJ1dG9yLCBDb21taXQsIFB1 bGxSZXF1ZXN0LCBwcm9ncmFtLCBtb2NrcywgcmVtb3RlCitmcm9tIHdlYmtpdGNvcmVweS5tb2Nr cyBpbXBvcnQgVGVybWluYWwgYXMgTW9ja1Rlcm1pbmFsCitmcm9tIHdlYmtpdHNjbXB5IGltcG9y dCBDb250cmlidXRvciwgQ29tbWl0LCBQdWxsUmVxdWVzdCwgbG9jYWwsIHByb2dyYW0sIG1vY2tz LCByZW1vdGUKIAogCiBjbGFzcyBUZXN0UHVsbFJlcXVlc3QodW5pdHRlc3QuVGVzdENhc2UpOgpA QCAtMTQ1LDcgKzE0Niw2IEBAIFJldmlld2VkIGJ5IFRpbSBDb250cmlidXRvci4KICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChjb21taXRzWzFdLm1lc3NhZ2UsICdbc2NvcGluZ10gQnVnIHRvIGZp eCAoUGFydCAxKVxuXG5SZXZpZXdlZCBieSBUaW0gQ29udHJpYnV0b3IuJykKIAogICAgIGRlZiB0 ZXN0X3BhcnNlX2h0bWxfYm9keV9tdWx0aXBsZShzZWxmKToKLSAgICAgICAgc2VsZi5tYXhEaWZm ID0gTm9uZQogICAgICAgICBib2R5LCBjb21taXRzID0gUHVsbFJlcXVlc3QucGFyc2VfYm9keSgn JycjIyMjIDExYWE3NmY5ZmMzODBlOWZlMDYxNTcxNTRmMzJiMzA0ZThkYzQ3NDkKIDxwcmU+CiBb c2NvcGluZ10gQnVnIHRvIGZpeCAoUGFydCAyKQpAQCAtMzU4LDcgKzM1OCw0MiBAQCBSZWJhc2Vk ICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnCiAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChj YXB0dXJlZC5zdGRlcnIuZ2V0dmFsdWUoKSwgJycpCiAgICAgICAgIGxvZyA9IGNhcHR1cmVkLnJv b3QubG9nLmdldHZhbHVlKCkuc3BsaXRsaW5lcygpCi0gICAgICAgIHNlbGYubWF4RGlmZiA9IE5v bmUKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgIFtsaW5lIGZvciBsaW5l IGluIGxvZyBpZiAnTW9jayBwcm9jZXNzJyBub3QgaW4gbGluZV0sIFsKKyAgICAgICAgICAgICAg ICAiQW1lbmRpbmcgY29tbWl0Li4uIiwKKyAgICAgICAgICAgICAgICAnICAgIEZvdW5kIDEgY29t bWl0Li4uJywKKyAgICAgICAgICAgICAgICAiUmViYXNpbmcgJ2VuZy9wci1icmFuY2gnIG9uICdt YWluJy4uLiIsCisgICAgICAgICAgICAgICAgIlJlYmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdt YWluISciLAorICAgICAgICAgICAgICAgICIgICAgRm91bmQgMSBjb21taXQuLi4iLAorICAgICAg ICAgICAgICAgICJQdXNoaW5nICdlbmcvcHItYnJhbmNoJyB0byAnZm9yaycuLi4iLAorICAgICAg ICAgICAgICAgICJVcGRhdGluZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIs CisgICAgICAgICAgICAgICAgIlVwZGF0ZWQgJ1BSIDEgfCBBbWVuZGVkIGNvbW1pdCchIiwKKyAg ICAgICAgICAgIF0sCisgICAgICAgICkKKworICAgIGRlZiB0ZXN0X2dpdGh1Yl9yZW9wZW4oc2Vs Zik6CisgICAgICAgIHdpdGggbW9ja3MucmVtb3RlLkdpdEh1YigpIGFzIHJlbW90ZSwgbW9ja3Mu bG9jYWwuR2l0KHNlbGYucGF0aCwgcmVtb3RlPSdodHRwczovL3t9Jy5mb3JtYXQocmVtb3RlLnJl bW90ZSkpIGFzIHJlcG8sIG1vY2tzLmxvY2FsLlN2bigpOgorICAgICAgICAgICAgd2l0aCBPdXRw dXRDYXB0dXJlKCk6CisgICAgICAgICAgICAgICAgcmVwby5zdGFnZWRbJ2FkZGVkLnR4dCddID0g J2FkZGVkJworICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5tYWlu KAorICAgICAgICAgICAgICAgICAgICBhcmdzPSgncHVsbC1yZXF1ZXN0JywgJy1pJywgJ3ByLWJy YW5jaCcpLAorICAgICAgICAgICAgICAgICAgICBwYXRoPXNlbGYucGF0aCwKKyAgICAgICAgICAg ICAgICApKQorCisgICAgICAgICAgICBsb2NhbC5HaXQoc2VsZi5wYXRoKS5yZW1vdGUoKS5wdWxs X3JlcXVlc3RzLmdldCgxKS5jbG9zZSgpCisgICAgICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGxv Y2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLnB1bGxfcmVxdWVzdHMuZ2V0KDEpLm9wZW5lZCkK KworICAgICAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQsIE1vY2tUZXJt aW5hbC5pbnB1dCgnbicpOgorICAgICAgICAgICAgICAgIHJlcG8uc3RhZ2VkWydhZGRlZC50eHQn XSA9ICdkaWZmJworICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5t YWluKAorICAgICAgICAgICAgICAgICAgICBhcmdzPSgncHVsbC1yZXF1ZXN0JywpLAorICAgICAg ICAgICAgICAgICAgICBwYXRoPXNlbGYucGF0aCwKKyAgICAgICAgICAgICAgICApKQorCisgICAg ICAgICAgICBzZWxmLmFzc2VydFRydWUobG9jYWwuR2l0KHNlbGYucGF0aCkucmVtb3RlKCkucHVs bF9yZXF1ZXN0cy5nZXQoMSkub3BlbmVkKQorCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2Fw dHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICcnKQorICAgICAgICBsb2cgPSBjYXB0dXJlZC5yb290 LmxvZy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAog ICAgICAgICAgICAgW2xpbmUgZm9yIGxpbmUgaW4gbG9nIGlmICdNb2NrIHByb2Nlc3MnIG5vdCBp biBsaW5lXSwgWwogICAgICAgICAgICAgICAgICJBbWVuZGluZyBjb21taXQuLi4iLApAQCAtNDMy LDYgKzQ2Nyw0NCBAQCBSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnCiAgICAgICAg ICAgICBdLAogICAgICAgICApCiAKKyAgICBkZWYgdGVzdF9iaXRidWNrZXRfcmVvcGVuKHNlbGYp OgorICAgICAgICB3aXRoIG1vY2tzLnJlbW90ZS5CaXRCdWNrZXQoKSBhcyByZW1vdGUsIG1vY2tz LmxvY2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0nc3NoOi8vZ2l0QHt9L3t9L3t9LmdpdCcuZm9y bWF0KAorICAgICAgICAgICAgcmVtb3RlLmhvc3RzWzBdLCByZW1vdGUucHJvamVjdC5zcGxpdCgn LycpWzFdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzNdLAorICAgICAgICApKSBhcyByZXBv LCBtb2Nrcy5sb2NhbC5Tdm4oKToKKyAgICAgICAgICAgIHdpdGggT3V0cHV0Q2FwdHVyZSgpOgor ICAgICAgICAgICAgICAgIHJlcG8uc3RhZ2VkWydhZGRlZC50eHQnXSA9ICdhZGRlZCcKKyAgICAg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFpbigKKyAgICAgICAgICAg ICAgICAgICAgYXJncz0oJ3B1bGwtcmVxdWVzdCcsICctaScsICdwci1icmFuY2gnKSwKKyAgICAg ICAgICAgICAgICAgICAgcGF0aD1zZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgKSkKKworICAg ICAgICAgICAgbG9jYWwuR2l0KHNlbGYucGF0aCkucmVtb3RlKCkucHVsbF9yZXF1ZXN0cy5nZXQo MSkuY2xvc2UoKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShsb2NhbC5HaXQoc2VsZi5w YXRoKS5yZW1vdGUoKS5wdWxsX3JlcXVlc3RzLmdldCgxKS5vcGVuZWQpCisKKyAgICAgICAgICAg IHdpdGggT3V0cHV0Q2FwdHVyZSgpIGFzIGNhcHR1cmVkLCBNb2NrVGVybWluYWwuaW5wdXQoJ24n KToKKyAgICAgICAgICAgICAgICByZXBvLnN0YWdlZFsnYWRkZWQudHh0J10gPSAnZGlmZicKKyAg ICAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFpbigKKyAgICAgICAg ICAgICAgICAgICAgYXJncz0oJ3B1bGwtcmVxdWVzdCcsKSwKKyAgICAgICAgICAgICAgICAgICAg cGF0aD1zZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgKSkKKworICAgICAgICAgICAgc2VsZi5h c3NlcnRUcnVlKGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLnB1bGxfcmVxdWVzdHMuZ2V0 KDEpLm9wZW5lZCkKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZGVyci5n ZXR2YWx1ZSgpLCAnJykKKyAgICAgICAgbG9nID0gY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUo KS5zcGxpdGxpbmVzKCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgIFts aW5lIGZvciBsaW5lIGluIGxvZyBpZiAnTW9jayBwcm9jZXNzJyBub3QgaW4gbGluZV0sIFsKKyAg ICAgICAgICAgICAgICAiQW1lbmRpbmcgY29tbWl0Li4uIiwKKyAgICAgICAgICAgICAgICAnICAg IEZvdW5kIDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAgICAiUmViYXNpbmcgJ2VuZy9wci1i cmFuY2gnIG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAgICAgIlJlYmFzZWQgJ2VuZy9wci1i cmFuY2gnIG9uICdtYWluISciLAorICAgICAgICAgICAgICAgICIgICAgRm91bmQgMSBjb21taXQu Li4iLAorICAgICAgICAgICAgICAgICJQdXNoaW5nICdlbmcvcHItYnJhbmNoJyB0byAnb3JpZ2lu Jy4uLiIsCisgICAgICAgICAgICAgICAgIlVwZGF0aW5nIHB1bGwtcmVxdWVzdCBmb3IgJ2VuZy9w ci1icmFuY2gnLi4uIiwKKyAgICAgICAgICAgICAgICAiVXBkYXRlZCAnUFIgMSB8IEFtZW5kZWQg Y29tbWl0JyEiLAorICAgICAgICAgICAgXSwKKyAgICAgICAgKQorCiAKIGNsYXNzIFRlc3ROZXR3 b3JrUHVsbFJlcXVlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIHJlbW90ZSA9ICdo dHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0Jwo=