70358 2011-10-18 13:35:28 -0700 watchlist: Should try to run if it can and not throw on mistakes. 2011-10-18 18:37:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 69486 69487 1 levin levin abarth levin+watchlist webkit.review.bot oldest_to_newest 486278 0 levin 2011-10-18 13:35:28 -0700 It is too easy for someone to introduce a mistake and then break the watchlist for everyone. This is a precursor to dealing with bad regex and hooking this up to the style checker. 486283 1 111495 levin 2011-10-18 13:44:38 -0700 Created attachment 111495 Patch 486293 2 levin 2011-10-18 13:55:20 -0700 btw, the stuff about allowing a custom logger is so that I can put in something that goes directly to the style logger when I hook up style checking. 486329 3 111495 abarth 2011-10-18 15:00:09 -0700 Comment on attachment 111495 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111495&action=review > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:145 > - for email in cc_rule.instructions(): > + for email in cc_rule.instructions()[:]: Is this a stealth copy? Is there a way to make this more explicit? > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:147 > + cc_rule.remove_instruction(email) Ah, I see. 486507 4 levin 2011-10-18 18:37:11 -0700 Committed as http://trac.webkit.org/changeset/97820. 111495 2011-10-18 13:44:38 -0700 2011-10-18 15:00:09 -0700 Patch bug-70358-20111018134437.patch text/plain 22863 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTc3ODUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2YTU2NDM2MmM3ZWViMjI0NzI0OTM4NzJjNjFiYWU4NTMz YzNmM2RlLi4wYmE4YWE4YjY1Mjk2OTQ1MDA2YzFhMTZlZDAxYzg2ZmI5ZGUzZmY4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMTAtMTggIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIHdhdGNobGlzdDogU2hvdWxkIHRyeSB0byBydW4gaWYgaXQgY2FuIGFuZCBub3QgdGhyb3cg b24gbWlzdGFrZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03MDM1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL291dHB1dGNhcHR1cmUucHk6IEFk ZCB0aGUgYWJpbGl0eSB0byBjYXB0dXJlIGxvZyBvdXRwdXQuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdGxvYWRlcl91bml0dGVzdC5weTogQWRh cHQgdG8gdGhlIGxvZ2dpbmcgb2YgZXJyb3JzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXIucHk6IENoYW5nZSB0byBsb2cgcHJvYmxl bXMgYW5kIGZpeCBwcm9ibGVtcyB3aGVuIGZvdW5kLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXJfdW5pdHRlc3QucHk6IEFkYXB0IHRv IHRoZSBsb2dnaW5nIG9mIGVycm9ycy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi93YXRjaGxpc3Qvd2F0Y2hsaXN0cnVsZS5weTogRXhwb3NlIGEgd2F5IHRvIHJlbW92ZSBpbnN0 cnVjdGlvbnMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dh dGNobGlzdHJ1bGVfdW5pdHRlc3QucHk6IFRlc3QgdGhlIG5ldyBmdW5jdGlvbi4KKwogMjAxMS0x MC0xOCAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFNwbGl0IFRlc3RFeHBlY3RhdGlvbnNFZGl0b3IgaW50byBpdHMgb3duIGZpbGUuCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vb3V0cHV0Y2FwdHVyZS5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9vdXRwdXRjYXB0dXJlLnB5 CmluZGV4IGVhNTA4MDFhZDMwMGQ0Yzk4YTAwNWYxNGRiYzVlN2I3YWM4NWVkZDYuLjdmYmM4NWM0 OTU1YjY0MzdhZjcxZjQ5ZGQwNGEyYzRlMWRiNGY1OGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9vdXRwdXRjYXB0dXJlLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9vdXRwdXRjYXB0dXJlLnB5CkBAIC0yOCw2ICsy OCw3IEBACiAjCiAjIENsYXNzIGZvciB1bml0dGVzdCBzdXBwb3J0LiAgVXNlZCBmb3IgY2FwdHVy aW5nIHN0ZGVyci9zdGRvdXQuCiAKK2ltcG9ydCBsb2dnaW5nCiBpbXBvcnQgc3lzCiBpbXBvcnQg dW5pdHRlc3QKIGZyb20gU3RyaW5nSU8gaW1wb3J0IFN0cmluZ0lPCkBAIC01MCwyMCArNTEsMzIg QEAgY2xhc3MgT3V0cHV0Q2FwdHVyZShvYmplY3QpOgogICAgICAgICByZXR1cm4gY2FwdHVyZWRf b3V0cHV0CiAKICAgICBkZWYgY2FwdHVyZV9vdXRwdXQoc2VsZik6CisgICAgICAgIHNlbGYuX2xv Z3MgPSBTdHJpbmdJTygpCisgICAgICAgIHNlbGYuX2xvZ3NfaGFuZGxlciA9IGxvZ2dpbmcuU3Ry ZWFtSGFuZGxlcihzZWxmLl9sb2dzKQorICAgICAgICBzZWxmLl9sb2dzX2hhbmRsZXIuc2V0TGV2 ZWwobG9nZ2luZy5JTkZPKQorICAgICAgICBsb2dnaW5nLmdldExvZ2dlcigpLmFkZEhhbmRsZXIo c2VsZi5fbG9nc19oYW5kbGVyKQogICAgICAgICByZXR1cm4gKHNlbGYuX2NhcHR1cmVfb3V0cHV0 X3dpdGhfbmFtZSgic3Rkb3V0IiksIHNlbGYuX2NhcHR1cmVfb3V0cHV0X3dpdGhfbmFtZSgic3Rk ZXJyIikpCiAKICAgICBkZWYgcmVzdG9yZV9vdXRwdXQoc2VsZik6Ci0gICAgICAgIHJldHVybiAo c2VsZi5fcmVzdG9yZV9vdXRwdXRfd2l0aF9uYW1lKCJzdGRvdXQiKSwgc2VsZi5fcmVzdG9yZV9v dXRwdXRfd2l0aF9uYW1lKCJzdGRlcnIiKSkKKyAgICAgICAgbG9nZ2luZy5nZXRMb2dnZXIoKS5y ZW1vdmVIYW5kbGVyKHNlbGYuX2xvZ3NfaGFuZGxlcikKKyAgICAgICAgc2VsZi5fbG9nc19oYW5k bGVyLmZsdXNoKCkKKyAgICAgICAgc2VsZi5fbG9ncy5mbHVzaCgpCisgICAgICAgIGxvZ3Nfc3Ry aW5nID0gc2VsZi5fbG9ncy5nZXR2YWx1ZSgpCisgICAgICAgIGRlbGF0dHIoc2VsZiwgJ19sb2dz X2hhbmRsZXInKQorICAgICAgICBkZWxhdHRyKHNlbGYsICdfbG9ncycpCisgICAgICAgIHJldHVy biAoc2VsZi5fcmVzdG9yZV9vdXRwdXRfd2l0aF9uYW1lKCJzdGRvdXQiKSwgc2VsZi5fcmVzdG9y ZV9vdXRwdXRfd2l0aF9uYW1lKCJzdGRlcnIiKSwgbG9nc19zdHJpbmcpCiAKLSAgICBkZWYgYXNz ZXJ0X291dHB1dHMoc2VsZiwgdGVzdGNhc2UsIGZ1bmN0aW9uLCBhcmdzPVtdLCBrd2FyZ3M9e30s IGV4cGVjdGVkX3N0ZG91dD0iIiwgZXhwZWN0ZWRfc3RkZXJyPSIiLCBleHBlY3RlZF9leGNlcHRp b249Tm9uZSk6CisgICAgZGVmIGFzc2VydF9vdXRwdXRzKHNlbGYsIHRlc3RjYXNlLCBmdW5jdGlv biwgYXJncz1bXSwga3dhcmdzPXt9LCBleHBlY3RlZF9zdGRvdXQ9IiIsIGV4cGVjdGVkX3N0ZGVy cj0iIiwgZXhwZWN0ZWRfZXhjZXB0aW9uPU5vbmUsIGV4cGVjdGVkX2xvZ3M9Tm9uZSk6CiAgICAg ICAgIHNlbGYuY2FwdHVyZV9vdXRwdXQoKQogICAgICAgICBpZiBleHBlY3RlZF9leGNlcHRpb246 CiAgICAgICAgICAgICByZXR1cm5fdmFsdWUgPSB0ZXN0Y2FzZS5hc3NlcnRSYWlzZXMoZXhwZWN0 ZWRfZXhjZXB0aW9uLCBmdW5jdGlvbiwgKmFyZ3MsICoqa3dhcmdzKQogICAgICAgICBlbHNlOgog ICAgICAgICAgICAgcmV0dXJuX3ZhbHVlID0gZnVuY3Rpb24oKmFyZ3MsICoqa3dhcmdzKQotICAg ICAgICAoc3Rkb3V0X3N0cmluZywgc3RkZXJyX3N0cmluZykgPSBzZWxmLnJlc3RvcmVfb3V0cHV0 KCkKKyAgICAgICAgKHN0ZG91dF9zdHJpbmcsIHN0ZGVycl9zdHJpbmcsIGxvZ3Nfc3RyaW5nKSA9 IHNlbGYucmVzdG9yZV9vdXRwdXQoKQogICAgICAgICB0ZXN0Y2FzZS5hc3NlcnRFcXVhbChzdGRv dXRfc3RyaW5nLCBleHBlY3RlZF9zdGRvdXQpCiAgICAgICAgIHRlc3RjYXNlLmFzc2VydEVxdWFs KHN0ZGVycl9zdHJpbmcsIGV4cGVjdGVkX3N0ZGVycikKKyAgICAgICAgaWYgZXhwZWN0ZWRfbG9n cyBpcyBub3QgTm9uZToKKyAgICAgICAgICAgIHRlc3RjYXNlLmFzc2VydEVxdWFsKGxvZ3Nfc3Ry aW5nLCBleHBlY3RlZF9sb2dzKQogICAgICAgICAjIFRoaXMgaXMgYSBsaXR0bGUgc3RyYW5nZSwg YnV0IEkgZG9uJ3Qga25vdyB3aGVyZSBlbHNlIHRvIHJldHVybiB0aGlzIGluZm9ybWF0aW9uLgog ICAgICAgICByZXR1cm4gcmV0dXJuX3ZhbHVlCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3Rsb2FkZXJfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0bG9hZGVyX3Vu aXR0ZXN0LnB5CmluZGV4IDNhYzdhZmVjMGJjZDY5NTAxZTRjODA2OWZlNzdhM2IxMzgxY2QwNDMu LjhkM2ZhOTgwNmEzYTdjNWNmMGNhMWQzYzdiOGEwOTYwZjM4ZTRlNzEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3Rsb2FkZXJfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dh dGNobGlzdGxvYWRlcl91bml0dGVzdC5weQpAQCAtMzEsNiArMzEsNyBAQAogZnJvbSB3ZWJraXRw eS5jb21tb24gaW1wb3J0IHdlYmtpdHVuaXR0ZXN0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0gaW1wb3J0IGZpbGVzeXN0ZW1fbW9jawogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGlt cG9ydCBmaWxlc3lzdGVtCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVy ZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5jb21tb24ud2F0Y2hsaXN0Lndh dGNobGlzdGxvYWRlciBpbXBvcnQgV2F0Y2hMaXN0TG9hZGVyCiAKIApAQCAtNDEsNCArNDIsNCBA QCBjbGFzcyBXYXRjaExpc3RMb2FkZXJUZXN0KHdlYmtpdHVuaXR0ZXN0LlRlc3RDYXNlKToKIAog ICAgIGRlZiB0ZXN0X3dhdGNoX2xpc3RfbG9hZChzZWxmKToKICAgICAgICAgIyBUZXN0IHBhcnNp bmcgb2YgdGhlIGNoZWNrZWQtaW4gd2F0Y2ggbGlzdC4KLSAgICAgICAgV2F0Y2hMaXN0TG9hZGVy KGZpbGVzeXN0ZW0uRmlsZVN5c3RlbSgpKS5sb2FkKCkKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgp LmFzc2VydF9vdXRwdXRzKHNlbGYsIFdhdGNoTGlzdExvYWRlcihmaWxlc3lzdGVtLkZpbGVTeXN0 ZW0oKSkubG9hZCwgZXhwZWN0ZWRfbG9ncz0iIikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyLnB5CmluZGV4IDdj NWI0NmNmYjRmNmM5NzE1OTU2N2JmOWYzMDg4NjRkMzM5YmM5M2MuLjZiNDk3MTA0OGEzZjdjZTRl Y2I4NDRiYjlhMTQ3YjRkNWUzMzg5MzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weQpAQCAtMjgsNiAr MjgsNyBAQAogCiAKIGltcG9ydCBkaWZmbGliCitpbXBvcnQgbG9nZ2luZwogaW1wb3J0IHJlCiAK IGZyb20gd2Via2l0cHkuY29tbW9uLndhdGNobGlzdC5hbW91bnRjaGFuZ2VkcGF0dGVybiBpbXBv cnQgQW1vdW50Q2hhbmdlZFBhdHRlcm4KQEAgLTM4LDEzICszOSwxNyBAQCBmcm9tIHdlYmtpdHB5 LmNvbW1vbi53YXRjaGxpc3Qud2F0Y2hsaXN0cnVsZSBpbXBvcnQgV2F0Y2hMaXN0UnVsZQogZnJv bSB3ZWJraXRweS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QK IAogCitfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCisKKwogY2xhc3MgV2F0Y2hM aXN0UGFyc2VyKG9iamVjdCk6CiAgICAgX0RFRklOSVRJT05TID0gJ0RFRklOSVRJT05TJwogICAg IF9DQ19SVUxFUyA9ICdDQ19SVUxFUycKICAgICBfTUVTU0FHRV9SVUxFUyA9ICdNRVNTQUdFX1JV TEVTJwogICAgIF9JTlZBTElEX0RFRklOSVRJT05fTkFNRV9SRUdFWCA9IHInXHwnCiAKLSAgICBk ZWYgX19pbml0X18oc2VsZik6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGxvZ19lcnJvcj1Ob25l KToKKyAgICAgICAgc2VsZi5fbG9nX2Vycm9yID0gbG9nX2Vycm9yIG9yIF9sb2cuZXJyb3IKICAg ICAgICAgc2VsZi5fc2VjdGlvbl9wYXJzZXJzID0gewogICAgICAgICAgICAgc2VsZi5fREVGSU5J VElPTlM6IHNlbGYuX3BhcnNlX2RlZmluaXRpb25fc2VjdGlvbiwKICAgICAgICAgICAgIHNlbGYu X0NDX1JVTEVTOiBzZWxmLl9wYXJzZV9jY19ydWxlcywKQEAgLTY4LDkgKzczLDEwIEBAIGNsYXNz IFdhdGNoTGlzdFBhcnNlcihvYmplY3QpOgogICAgICAgICBmb3Igc2VjdGlvbiBpbiBkaWN0aW9u YXJ5OgogICAgICAgICAgICAgcGFyc2VyID0gc2VsZi5fc2VjdGlvbl9wYXJzZXJzLmdldChzZWN0 aW9uKQogICAgICAgICAgICAgaWYgbm90IHBhcnNlcjoKLSAgICAgICAgICAgICAgICByYWlzZSBF eGNlcHRpb24oKCdVbmtub3duIHNlY3Rpb24gIiVzIiBpbiB3YXRjaCBsaXN0LicKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICsgc2VsZi5fc3VnZ2VzdF93b3JkcyhzZWN0aW9uLCBz ZWxmLl9zZWN0aW9uX3BhcnNlcnMua2V5cygpKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJSBzZWN0aW9uKQorICAgICAgICAgICAgICAgIHNlbGYuX2xvZ19lcnJvcigoJ1Vua25v d24gc2VjdGlvbiAiJXMiIGluIHdhdGNoIGxpc3QuJworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICArIHNlbGYuX3N1Z2dlc3Rfd29yZHMoc2VjdGlvbiwgc2VsZi5fc2VjdGlvbl9wYXJz ZXJzLmtleXMoKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSBzZWN0aW9uKQor ICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICBwYXJzZXIoZGljdGlvbmFyeVtz ZWN0aW9uXSwgd2F0Y2hfbGlzdCkKIAogICAgICAgICBzZWxmLl92YWxpZGF0ZSh3YXRjaF9saXN0 KQpAQCAtOTAsMjEgKzk2LDI0IEBAIGNsYXNzIFdhdGNoTGlzdFBhcnNlcihvYmplY3QpOgogICAg ICAgICBmb3IgbmFtZSBpbiBkZWZpbml0aW9uX3NlY3Rpb246CiAgICAgICAgICAgICBpbnZhbGlk X2NoYXJhY3RlciA9IHJlLnNlYXJjaChzZWxmLl9JTlZBTElEX0RFRklOSVRJT05fTkFNRV9SRUdF WCwgbmFtZSkKICAgICAgICAgICAgIGlmIGludmFsaWRfY2hhcmFjdGVyOgotICAgICAgICAgICAg ICAgIHJhaXNlIEV4Y2VwdGlvbignSW52YWxpZCBjaGFyYWN0ZXIgIiVzIiBpbiBkZWZpbml0aW9u ICIlcyIuJyAlIChpbnZhbGlkX2NoYXJhY3Rlci5ncm91cCgwKSwgbmFtZSkpCisgICAgICAgICAg ICAgICAgc2VsZi5fbG9nX2Vycm9yKCdJbnZhbGlkIGNoYXJhY3RlciAiJXMiIGluIGRlZmluaXRp b24gIiVzIi4nICUgKGludmFsaWRfY2hhcmFjdGVyLmdyb3VwKDApLCBuYW1lKSkKKyAgICAgICAg ICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAgICBkZWZpbml0aW9uID0gZGVmaW5pdGlvbl9z ZWN0aW9uW25hbWVdCiAgICAgICAgICAgICBkZWZpbml0aW9uc1tuYW1lXSA9IFtdCiAgICAgICAg ICAgICBmb3IgcGF0dGVybl90eXBlIGluIGRlZmluaXRpb246CiAgICAgICAgICAgICAgICAgcGF0 dGVybl9wYXJzZXIgPSBzZWxmLl9kZWZpbml0aW9uX3BhdHRlcm5fcGFyc2Vycy5nZXQocGF0dGVy bl90eXBlKQogICAgICAgICAgICAgICAgIGlmIG5vdCBwYXR0ZXJuX3BhcnNlcjoKLSAgICAgICAg ICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCgnVW5rbm93biBwYXR0ZXJuIHR5cGUgIiVzIiBp biBkZWZpbml0aW9uICIlcyIuJworICAgICAgICAgICAgICAgICAgICBzZWxmLl9sb2dfZXJyb3Io KCdVbmtub3duIHBhdHRlcm4gdHlwZSAiJXMiIGluIGRlZmluaXRpb24gIiVzIi4nCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyBzZWxmLl9zdWdnZXN0X3dvcmRzKHBhdHRl cm5fdHlwZSwgc2VsZi5fZGVmaW5pdGlvbl9wYXR0ZXJuX3BhcnNlcnMua2V5cygpKSkKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgKHBhdHRlcm5fdHlwZSwgbmFtZSkpCisg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKICAgICAgICAgICAgICAgICBwYXR0ZXJuID0g cGF0dGVybl9wYXJzZXIoZGVmaW5pdGlvbltwYXR0ZXJuX3R5cGVdKQogICAgICAgICAgICAgICAg IGRlZmluaXRpb25zW25hbWVdLmFwcGVuZChwYXR0ZXJuKQogICAgICAgICAgICAgaWYgbm90IGRl ZmluaXRpb25zW25hbWVdOgotICAgICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignVGhlIGRl ZmluaXRpb24gIiVzIiBoYXMgbm8gcGF0dGVybnMsIHNvIGl0IHNob3VsZCBiZSBkZWxldGVkLicg JSBuYW1lKQorICAgICAgICAgICAgICAgIHNlbGYuX2xvZ19lcnJvcignVGhlIGRlZmluaXRpb24g IiVzIiBoYXMgbm8gcGF0dGVybnMsIHNvIGl0IHNob3VsZCBiZSBkZWxldGVkLicgJSBuYW1lKQor ICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgIHdhdGNoX2xpc3QuZGVmaW5pdGlvbnMg PSBkZWZpbml0aW9ucwogCiAgICAgZGVmIF9wYXJzZV9ydWxlcyhzZWxmLCBydWxlc19zZWN0aW9u KToKQEAgLTExMiw3ICsxMjEsOCBAQCBjbGFzcyBXYXRjaExpc3RQYXJzZXIob2JqZWN0KToKICAg ICAgICAgZm9yIGNvbXBsZXhfZGVmaW5pdGlvbiBpbiBydWxlc19zZWN0aW9uOgogICAgICAgICAg ICAgaW5zdHJ1Y3Rpb25zID0gcnVsZXNfc2VjdGlvbltjb21wbGV4X2RlZmluaXRpb25dCiAgICAg ICAgICAgICBpZiBub3QgaW5zdHJ1Y3Rpb25zOgotICAgICAgICAgICAgICAgIHJhaXNlIEV4Y2Vw dGlvbignQSBydWxlIGZvciBkZWZpbml0aW9uICIlcyIgaXMgZW1wdHksIHNvIGl0IHNob3VsZCBi ZSBkZWxldGVkLicgJSBjb21wbGV4X2RlZmluaXRpb24pCisgICAgICAgICAgICAgICAgc2VsZi5f bG9nX2Vycm9yKCdBIHJ1bGUgZm9yIGRlZmluaXRpb24gIiVzIiBpcyBlbXB0eSwgc28gaXQgc2hv dWxkIGJlIGRlbGV0ZWQuJyAlIGNvbXBsZXhfZGVmaW5pdGlvbikKKyAgICAgICAgICAgICAgICBj b250aW51ZQogICAgICAgICAgICAgcnVsZXMuYXBwZW5kKFdhdGNoTGlzdFJ1bGUoY29tcGxleF9k ZWZpbml0aW9uLCBpbnN0cnVjdGlvbnMpKQogICAgICAgICByZXR1cm4gcnVsZXMKIApAQCAtMTMy LDE1ICsxNDIsMTcgQEAgY2xhc3MgV2F0Y2hMaXN0UGFyc2VyKG9iamVjdCk6CiAKICAgICAgICAg Y29udHJpYnV0b3JzID0gQ29tbWl0dGVyTGlzdCgpCiAgICAgICAgIGZvciBjY19ydWxlIGluIHdh dGNoX2xpc3QuY2NfcnVsZXM6Ci0gICAgICAgICAgICBmb3IgZW1haWwgaW4gY2NfcnVsZS5pbnN0 cnVjdGlvbnMoKToKKyAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjY19ydWxlLmluc3RydWN0aW9u cygpWzpdOgogICAgICAgICAgICAgICAgIGlmIG5vdCBjb250cmlidXRvcnMuY29udHJpYnV0b3Jf YnlfZW1haWwoZW1haWwpOgotICAgICAgICAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oIlRo ZSBlbWFpbCBhbGlhcyAlcyB3aGljaCBpcyBpbiB0aGUgd2F0Y2hsaXN0IGlzIG5vdCBsaXN0ZWQg YXMgYSBjb250cmlidXRvciBpbiBjb21taXR0ZXJzLnB5IiAlIGVtYWlsKQorICAgICAgICAgICAg ICAgICAgICBjY19ydWxlLnJlbW92ZV9pbnN0cnVjdGlvbihlbWFpbCkKKyAgICAgICAgICAgICAg ICAgICAgc2VsZi5fbG9nX2Vycm9yKCJUaGUgZW1haWwgYWxpYXMgJXMgd2hpY2ggaXMgaW4gdGhl IHdhdGNobGlzdCBpcyBub3QgbGlzdGVkIGFzIGEgY29udHJpYnV0b3IgaW4gY29tbWl0dGVycy5w eSIgJSBlbWFpbCkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWUKIAogICAgIGRlZiBfdmVy aWZ5X2FsbF9kZWZpbml0aW9uc19hcmVfdXNlZChzZWxmLCB3YXRjaF9saXN0LCB1c2VkX2RlZmlu aXRpb25zKToKICAgICAgICAgZGVmaW5pdGlvbnNfbm90X3VzZWQgPSBzZXQod2F0Y2hfbGlzdC5k ZWZpbml0aW9ucy5rZXlzKCkpCiAgICAgICAgIGRlZmluaXRpb25zX25vdF91c2VkLmRpZmZlcmVu Y2VfdXBkYXRlKHVzZWRfZGVmaW5pdGlvbnMpCiAgICAgICAgIGlmIGRlZmluaXRpb25zX25vdF91 c2VkOgotICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdUaGUgZm9sbG93aW5nIGRlZmluaXRp b25zIGFyZSBub3QgdXNlZCBhbmQgc2hvdWxkIGJlIHJlbW92ZWQ6ICVzJyAlICgnLCAnLmpvaW4o ZGVmaW5pdGlvbnNfbm90X3VzZWQpKSkKKyAgICAgICAgICAgIHNlbGYuX2xvZ19lcnJvcignVGhl IGZvbGxvd2luZyBkZWZpbml0aW9ucyBhcmUgbm90IHVzZWQgYW5kIHNob3VsZCBiZSByZW1vdmVk OiAlcycgJSAoJywgJy5qb2luKGRlZmluaXRpb25zX25vdF91c2VkKSkpCiAKICAgICBkZWYgX3Zh bGlkYXRlX2RlZmluaXRpb25zKHNlbGYsIGRlZmluaXRpb25zLCBydWxlc19zZWN0aW9uX25hbWUs IHdhdGNoX2xpc3QpOgogICAgICAgICBkZWNsYXJlZF9kZWZpbml0aW9ucyA9IHdhdGNoX2xpc3Qu ZGVmaW5pdGlvbnMua2V5cygpCkBAIC0xNTEsNyArMTYzLDcgQEAgY2xhc3MgV2F0Y2hMaXN0UGFy c2VyKG9iamVjdCk6CiAgICAgICAgICAgICBzdWdnZXN0aW9ucyA9ICcnCiAgICAgICAgICAgICBp ZiBsZW4oZGVmaW5pdGlvbl9zZXQpID09IDE6CiAgICAgICAgICAgICAgICAgc3VnZ2VzdGlvbnMg PSBzZWxmLl9zdWdnZXN0X3dvcmRzKHNldCgpLnVuaW9uKGRlZmluaXRpb25fc2V0KS5wb3AoKSwg ZGVjbGFyZWRfZGVmaW5pdGlvbnMpCi0gICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ0luIHNl Y3Rpb24gIiVzIiwgdGhlIGZvbGxvd2luZyBkZWZpbml0aW9ucyBhcmUgbm90IHVzZWQgYW5kIHNo b3VsZCBiZSByZW1vdmVkOiAlcyVzJyAlIChydWxlc19zZWN0aW9uX25hbWUsICcsICcuam9pbihk ZWZpbml0aW9uX3NldCksIHN1Z2dlc3Rpb25zKSkKKyAgICAgICAgICAgIHNlbGYuX2xvZ19lcnJv cignSW4gc2VjdGlvbiAiJXMiLCB0aGUgZm9sbG93aW5nIGRlZmluaXRpb25zIGFyZSBub3QgdXNl ZCBhbmQgc2hvdWxkIGJlIHJlbW92ZWQ6ICVzJXMnICUgKHJ1bGVzX3NlY3Rpb25fbmFtZSwgJywg Jy5qb2luKGRlZmluaXRpb25fc2V0KSwgc3VnZ2VzdGlvbnMpKQogCiAgICAgZGVmIF9ydWxlX2Rl ZmluaXRpb25zX2FzX3NldChzZWxmLCBydWxlcyk6CiAgICAgICAgIGRlZmluaXRpb25fc2V0ID0g c2V0KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlz dC93YXRjaGxpc3RwYXJzZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyX3VuaXR0ZXN0LnB5CmluZGV4IDJiMGQ1N2E3 MDIzOTdkZjliODM3MGNlNGI3Yjc4YTczYjU1ODZiYmMuLjkxYTQ2N2EyNWZjYjcwMWQ5MDRiYmU2 YjQyN2IxNWVhYjljOWFjMmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlcl91bml0dGVzdC5w eQpAQCAtMjgsNyArMjgsMTMgQEAKIAogJycnVW5pdCB0ZXN0cyBmb3Igd2F0Y2hsaXN0cGFyc2Vy LnB5LicnJwogCisKK2ltcG9ydCBsb2dnaW5nCitpbXBvcnQgc3lzCisKKwogZnJvbSB3ZWJraXRw eS5jb21tb24gaW1wb3J0IHdlYmtpdHVuaXR0ZXN0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5jb21t b24ud2F0Y2hsaXN0LndhdGNobGlzdHBhcnNlciBpbXBvcnQgV2F0Y2hMaXN0UGFyc2VyCiAKIApA QCAtMzgsMTkgKzQ0LDE4IEBAIGNsYXNzIFdhdGNoTGlzdFBhcnNlclRlc3Qod2Via2l0dW5pdHRl c3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLl93YXRjaF9saXN0X3BhcnNlciA9IFdhdGNoTGlz dFBhcnNlcigpCiAKICAgICBkZWYgdGVzdF9iYWRfc2VjdGlvbihzZWxmKToKLSAgICAgICAgd2F0 Y2hfbGlzdF93aXRoX2JhZF9zZWN0aW9uID0gKCd7IkZPTyI6IHt9fScpCi0gICAgICAgIHNlbGYu YXNzZXJ0UmFpc2VzUmVnZXhwKEV4Y2VwdGlvbiwgJ1Vua25vd24gc2VjdGlvbiAiRk9PIiBpbiB3 YXRjaCBsaXN0LicsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3dhdGNo X2xpc3RfcGFyc2VyLnBhcnNlLCB3YXRjaF9saXN0X3dpdGhfYmFkX3NlY3Rpb24pCisgICAgICAg IHdhdGNoX2xpc3QgPSAoJ3siRk9PIjoge319JykKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFz c2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlLCBhcmdzPVt3 YXRjaF9saXN0XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4cGVj dGVkX2xvZ3M9J1Vua25vd24gc2VjdGlvbiAiRk9PIiBpbiB3YXRjaCBsaXN0LlxuJykKIAogICAg IGRlZiB0ZXN0X3NlY3Rpb25fdHlwbyhzZWxmKToKLSAgICAgICAgd2F0Y2hfbGlzdF93aXRoX2Jh ZF9zZWN0aW9uID0gKCd7IkRFRklOVElPTlMiOiB7fX0nKQotICAgICAgICBzZWxmLmFzc2VydFJh aXNlc1JlZ2V4cChFeGNlcHRpb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHIn VW5rbm93biBzZWN0aW9uICJERUZJTlRJT05TIiBpbiB3YXRjaCBsaXN0XC5ccyonCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICsgcidQZXJoYXBzIGl0IHNob3VsZCBiZSBERUZJTklU SU9OU1wuJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fd2F0Y2hfbGlz dF9wYXJzZXIucGFyc2UsIHdhdGNoX2xpc3Rfd2l0aF9iYWRfc2VjdGlvbikKKyAgICAgICAgd2F0 Y2hfbGlzdCA9ICgneyJERUZJTlRJT05TIjoge319JykKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgp LmFzc2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlLCBhcmdz PVt3YXRjaF9saXN0XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4 cGVjdGVkX2xvZ3M9J1Vua25vd24gc2VjdGlvbiAiREVGSU5USU9OUyIgaW4gd2F0Y2ggbGlzdC4n CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArICdcblxuUGVyaGFwcyBp dCBzaG91bGQgYmUgREVGSU5JVElPTlMuXG4nKQogCiAgICAgZGVmIHRlc3RfYmFkX2RlZmluaXRp b24oc2VsZik6Ci0gICAgICAgIHdhdGNoX2xpc3Rfd2l0aF9iYWRfZGVmaW5pdGlvbiA9ICgKKyAg ICAgICAgd2F0Y2hfbGlzdCA9ICgKICAgICAgICAgICAgICd7JwogICAgICAgICAgICAgJyAgICAi REVGSU5JVElPTlMiOiB7JwogICAgICAgICAgICAgJyAgICAgICAgIldhdGNoTGlzdDF8QSI6IHsn CkBAIC01OSwzNSArNjQsNDMgQEAgY2xhc3MgV2F0Y2hMaXN0UGFyc2VyVGVzdCh3ZWJraXR1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAnICAgICB9LCcKICAgICAgICAgICAgICd9JykK IAotICAgICAgICBzZWxmLmFzc2VydFJhaXNlc1JlZ2V4cChFeGNlcHRpb24sIHInSW52YWxpZCBj aGFyYWN0ZXIgIlx8IiBpbiBkZWZpbml0aW9uICJXYXRjaExpc3QxXHxBIlwuJywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fd2F0Y2hfbGlzdF9wYXJzZXIucGFyc2UsIHdh dGNoX2xpc3Rfd2l0aF9iYWRfZGVmaW5pdGlvbikKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFz c2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlLCBhcmdzPVt3 YXRjaF9saXN0XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4cGVj dGVkX2xvZ3M9J0ludmFsaWQgY2hhcmFjdGVyICJ8IiBpbiBkZWZpbml0aW9uICJXYXRjaExpc3Qx fEEiLlxuJykKIAogICAgIGRlZiB0ZXN0X2JhZF9tYXRjaF90eXBlKHNlbGYpOgotICAgICAgICB3 YXRjaF9saXN0X3dpdGhfYmFkX21hdGNoX3R5cGUgPSAoCisgICAgICAgIHdhdGNoX2xpc3QgPSAo CiAgICAgICAgICAgICAneycKICAgICAgICAgICAgICcgICAgIkRFRklOSVRJT05TIjogeycKICAg ICAgICAgICAgICcgICAgICAgICJXYXRjaExpc3QxIjogeycKICAgICAgICAgICAgICcgICAgICAg ICAgICAibm90aGluZ19tYXRjaGVzX3RoaXMiOiByIi4qXFxNeUZpbGVOYW1lXFwuY3BwIiwnCisg ICAgICAgICAgICAnICAgICAgICAgICAgImZpbGVuYW1lIjogciIuKlxcTXlGaWxlTmFtZVxcLmNw cCIsJwogICAgICAgICAgICAgJyAgICAgICAgfSwnCiAgICAgICAgICAgICAnICAgICB9LCcKKyAg ICAgICAgICAgICcgICAgIkNDX1JVTEVTIjogeycKKyAgICAgICAgICAgICcgICAgICAgICJXYXRj aExpc3QxIjogWyJsZXZpbkBjaHJvbWl1bS5vcmciXSwnCisgICAgICAgICAgICAnICAgICB9LCcK ICAgICAgICAgICAgICd9JykKIAotICAgICAgICBzZWxmLmFzc2VydFJhaXNlc1JlZ2V4cChFeGNl cHRpb24sICdVbmtub3duIHBhdHRlcm4gdHlwZSAibm90aGluZ19tYXRjaGVzX3RoaXMiIGluIGRl ZmluaXRpb24gIldhdGNoTGlzdDEiLicsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlLCB3YXRjaF9saXN0X3dpdGhfYmFkX21hdGNo X3R5cGUpCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxm Ll93YXRjaF9saXN0X3BhcnNlci5wYXJzZSwgYXJncz1bd2F0Y2hfbGlzdF0sCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9sb2dzPSdVbmtub3duIHBhdHRl cm4gdHlwZSAibm90aGluZ19tYXRjaGVzX3RoaXMiIGluIGRlZmluaXRpb24gIldhdGNoTGlzdDEi LlxuJykKIAogICAgIGRlZiB0ZXN0X21hdGNoX3R5cGVfdHlwbyhzZWxmKToKLSAgICAgICAgd2F0 Y2hfbGlzdF93aXRoX2JhZF9tYXRjaF90eXBlID0gKAorICAgICAgICB3YXRjaF9saXN0ID0gKAog ICAgICAgICAgICAgJ3snCiAgICAgICAgICAgICAnICAgICJERUZJTklUSU9OUyI6IHsnCiAgICAg ICAgICAgICAnICAgICAgICAiV2F0Y2hMaXN0MSI6IHsnCiAgICAgICAgICAgICAnICAgICAgICAg ICAgImlmbGVuYW1lIjogciIuKlxcTXlGaWxlTmFtZVxcLmNwcCIsJworICAgICAgICAgICAgJyAg ICAgICAgICAgICJtb3JlIjogciJSZWZDb3VudGVkIiwnCiAgICAgICAgICAgICAnICAgICAgICB9 LCcKICAgICAgICAgICAgICcgICAgIH0sJworICAgICAgICAgICAgJyAgICAiQ0NfUlVMRVMiOiB7 JworICAgICAgICAgICAgJyAgICAgICAgIldhdGNoTGlzdDEiOiBbImxldmluQGNocm9taXVtLm9y ZyJdLCcKKyAgICAgICAgICAgICcgICAgIH0sJwogICAgICAgICAgICAgJ30nKQogCi0gICAgICAg IHNlbGYuYXNzZXJ0UmFpc2VzUmVnZXhwKEV4Y2VwdGlvbiwgcidVbmtub3duIHBhdHRlcm4gdHlw ZSAiaWZsZW5hbWUiIGluIGRlZmluaXRpb24gIldhdGNoTGlzdDEiXC5ccyonCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICsgcidQZXJoYXBzIGl0IHNob3VsZCBiZSBmaWxlbmFtZVwu JywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fd2F0Y2hfbGlzdF9wYXJz ZXIucGFyc2UsIHdhdGNoX2xpc3Rfd2l0aF9iYWRfbWF0Y2hfdHlwZSkKKyAgICAgICAgT3V0cHV0 Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBh cnNlLCBhcmdzPVt3YXRjaF9saXN0XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGV4cGVjdGVkX2xvZ3M9J1Vua25vd24gcGF0dGVybiB0eXBlICJpZmxlbmFtZSIgaW4g ZGVmaW5pdGlvbiAiV2F0Y2hMaXN0MSIuJworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKyAnXG5cblBlcmhhcHMgaXQgc2hvdWxkIGJlIGZpbGVuYW1lLlxuJykKIAogICAg IGRlZiB0ZXN0X2VtcHR5X2RlZmluaXRpb24oc2VsZik6CiAgICAgICAgIHdhdGNoX2xpc3QgPSAo CkBAIC05NiwxMCArMTA5LDEzIEBAIGNsYXNzIFdhdGNoTGlzdFBhcnNlclRlc3Qod2Via2l0dW5p dHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgJyAgICAgICAgIldhdGNoTGlzdDEiOiB7Jwog ICAgICAgICAgICAgJyAgICAgICAgfSwnCiAgICAgICAgICAgICAnICAgICB9LCcKKyAgICAgICAg ICAgICcgICAgIkNDX1JVTEVTIjogeycKKyAgICAgICAgICAgICcgICAgICAgICJXYXRjaExpc3Qx IjogWyJsZXZpbkBjaHJvbWl1bS5vcmciXSwnCisgICAgICAgICAgICAnICAgICB9LCcKICAgICAg ICAgICAgICd9JykKIAotICAgICAgICBzZWxmLmFzc2VydFJhaXNlc1JlZ2V4cChFeGNlcHRpb24s IHInVGhlIGRlZmluaXRpb24gIldhdGNoTGlzdDEiIGhhcyBubyBwYXR0ZXJucywgc28gaXQgc2hv dWxkIGJlIGRlbGV0ZWQuJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5f d2F0Y2hfbGlzdF9wYXJzZXIucGFyc2UsIHdhdGNoX2xpc3QpCisgICAgICAgIE91dHB1dENhcHR1 cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLl93YXRjaF9saXN0X3BhcnNlci5wYXJzZSwg YXJncz1bd2F0Y2hfbGlzdF0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBleHBlY3RlZF9sb2dzPSdUaGUgZGVmaW5pdGlvbiAiV2F0Y2hMaXN0MSIgaGFzIG5vIHBhdHRl cm5zLCBzbyBpdCBzaG91bGQgYmUgZGVsZXRlZC5cbicpCiAKICAgICBkZWYgdGVzdF9lbXB0eV9j Y19ydWxlKHNlbGYpOgogICAgICAgICB3YXRjaF9saXN0ID0gKApAQCAtMTE0LDggKzEzMCw5IEBA IGNsYXNzIFdhdGNoTGlzdFBhcnNlclRlc3Qod2Via2l0dW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICAgICAgJyAgICAgfSwnCiAgICAgICAgICAgICAnfScpCiAKLSAgICAgICAgc2VsZi5hc3Nl cnRSYWlzZXNSZWdleHAoRXhjZXB0aW9uLCByJ0EgcnVsZSBmb3IgZGVmaW5pdGlvbiAiV2F0Y2hM aXN0MSIgaXMgZW1wdHksIHNvIGl0IHNob3VsZCBiZSBkZWxldGVkLicsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlLCB3YXRjaF9s aXN0KQorICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgc2VsZi5f d2F0Y2hfbGlzdF9wYXJzZXIucGFyc2UsIGFyZ3M9W3dhdGNoX2xpc3RdLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfbG9ncz0nQSBydWxlIGZvciBkZWZp bml0aW9uICJXYXRjaExpc3QxIiBpcyBlbXB0eSwgc28gaXQgc2hvdWxkIGJlIGRlbGV0ZWQuXG4n CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArICdUaGUgZm9sbG93aW5n IGRlZmluaXRpb25zIGFyZSBub3QgdXNlZCBhbmQgc2hvdWxkIGJlIHJlbW92ZWQ6IFdhdGNoTGlz dDFcbicpCiAKICAgICBkZWYgdGVzdF9jY19ydWxlX3dpdGhfaW52YWxpZF9lbWFpbChzZWxmKToK ICAgICAgICAgd2F0Y2hfbGlzdCA9ICgKQEAgLTEzMCw4ICsxNDcsOSBAQCBjbGFzcyBXYXRjaExp c3RQYXJzZXJUZXN0KHdlYmtpdHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICcgICAg IH0sJwogICAgICAgICAgICAgJ30nKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzUmVnZXhw KEV4Y2VwdGlvbiwgcidUaGUgZW1haWwgYWxpYXMgbGV2aW5cK2JhZFwrZW1haWxAY2hyb21pdW0u b3JnIHdoaWNoIGlzIGluIHRoZSB3YXRjaGxpc3QgaXMgbm90IGxpc3RlZCBhcyBhIGNvbnRyaWJ1 dG9yIGluIGNvbW1pdHRlcnNcLnB5JywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VsZi5fd2F0Y2hfbGlzdF9wYXJzZXIucGFyc2UsIHdhdGNoX2xpc3QpCisgICAgICAgIE91dHB1 dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLl93YXRjaF9saXN0X3BhcnNlci5w YXJzZSwgYXJncz1bd2F0Y2hfbGlzdF0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBleHBlY3RlZF9sb2dzPSdUaGUgZW1haWwgYWxpYXMgbGV2aW4rYmFkK2VtYWlsQGNo cm9taXVtLm9yZyB3aGljaCBpcycKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICsgJyBpbiB0aGUgd2F0Y2hsaXN0IGlzIG5vdCBsaXN0ZWQgYXMgYSBjb250cmlidXRvciBp biBjb21taXR0ZXJzLnB5XG4nKQogCiAgICAgZGVmIHRlc3RfZW1wdHlfbWVzc2FnZV9ydWxlKHNl bGYpOgogICAgICAgICB3YXRjaF9saXN0ID0gKApAQCAtMTQ3LDggKzE2NSw5IEBAIGNsYXNzIFdh dGNoTGlzdFBhcnNlclRlc3Qod2Via2l0dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAg JyAgICAgfSwnCiAgICAgICAgICAgICAnfScpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXNS ZWdleHAoRXhjZXB0aW9uLCByJ0EgcnVsZSBmb3IgZGVmaW5pdGlvbiAiV2F0Y2hMaXN0MSIgaXMg ZW1wdHksIHNvIGl0IHNob3VsZCBiZSBkZWxldGVkLicsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlLCB3YXRjaF9saXN0KQorICAg ICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgc2VsZi5fd2F0Y2hfbGlz dF9wYXJzZXIucGFyc2UsIGFyZ3M9W3dhdGNoX2xpc3RdLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfbG9ncz0nQSBydWxlIGZvciBkZWZpbml0aW9uICJX YXRjaExpc3QxIiBpcyBlbXB0eSwgc28gaXQgc2hvdWxkIGJlIGRlbGV0ZWQuXG4nCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArICdUaGUgZm9sbG93aW5nIGRlZmluaXRp b25zIGFyZSBub3QgdXNlZCBhbmQgc2hvdWxkIGJlIHJlbW92ZWQ6IFdhdGNoTGlzdDFcbicpCiAK ICAgICBkZWYgdGVzdF91bnVzZWRfZGVmaW50aW9uKHNlbGYpOgogICAgICAgICB3YXRjaF9saXN0 ID0gKApAQCAtMTYwLDggKzE3OSw4IEBAIGNsYXNzIFdhdGNoTGlzdFBhcnNlclRlc3Qod2Via2l0 dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgJyAgICAgfSwnCiAgICAgICAgICAgICAn fScpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXNSZWdleHAoRXhjZXB0aW9uLCByJ1RoZSBm b2xsb3dpbmcgZGVmaW5pdGlvbnMgYXJlIG5vdCB1c2VkIGFuZCBzaG91bGQgYmUgcmVtb3ZlZDog V2F0Y2hMaXN0MScsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3dhdGNo X2xpc3RfcGFyc2VyLnBhcnNlLCB3YXRjaF9saXN0KQorICAgICAgICBPdXRwdXRDYXB0dXJlKCku YXNzZXJ0X291dHB1dHMoc2VsZiwgc2VsZi5fd2F0Y2hfbGlzdF9wYXJzZXIucGFyc2UsIGFyZ3M9 W3dhdGNoX2xpc3RdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXhw ZWN0ZWRfbG9ncz0nVGhlIGZvbGxvd2luZyBkZWZpbml0aW9ucyBhcmUgbm90IHVzZWQgYW5kIHNo b3VsZCBiZSByZW1vdmVkOiBXYXRjaExpc3QxXG4nKQogCiAgICAgZGVmIHRlc3RfY2NfcnVsZV93 aXRoX3VuZGVmaW5lZF9kZWZpbnRpb24oc2VsZik6CiAgICAgICAgIHdhdGNoX2xpc3QgPSAoCkBA IC0xNzEsOCArMTkwLDggQEAgY2xhc3MgV2F0Y2hMaXN0UGFyc2VyVGVzdCh3ZWJraXR1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAnICAgICB9LCcKICAgICAgICAgICAgICd9JykKIAot ICAgICAgICBzZWxmLmFzc2VydFJhaXNlc1JlZ2V4cChFeGNlcHRpb24sIHInSW4gc2VjdGlvbiAi Q0NfUlVMRVMiLCB0aGUgZm9sbG93aW5nIGRlZmluaXRpb25zIGFyZSBub3QgdXNlZCBhbmQgc2hv dWxkIGJlIHJlbW92ZWQ6IFdhdGNoTGlzdDEnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLl93YXRjaF9saXN0X3BhcnNlci5wYXJzZSwgd2F0Y2hfbGlzdCkKKyAgICAgICAg T3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuX3dhdGNoX2xpc3RfcGFy c2VyLnBhcnNlLCBhcmdzPVt3YXRjaF9saXN0XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGV4cGVjdGVkX2xvZ3M9J0luIHNlY3Rpb24gIkNDX1JVTEVTIiwgdGhlIGZv bGxvd2luZyBkZWZpbml0aW9ucyBhcmUgbm90IHVzZWQgYW5kIHNob3VsZCBiZSByZW1vdmVkOiBX YXRjaExpc3QxXG4nKQogCiAgICAgZGVmIHRlc3RfbWVzc2FnZV9ydWxlX3dpdGhfdW5kZWZpbmVk X2RlZmludGlvbihzZWxmKToKICAgICAgICAgd2F0Y2hfbGlzdCA9ICgKQEAgLTE4Miw4ICsyMDEs OCBAQCBjbGFzcyBXYXRjaExpc3RQYXJzZXJUZXN0KHdlYmtpdHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgICAgICcgICAgIH0sJwogICAgICAgICAgICAgJ30nKQogCi0gICAgICAgIHNlbGYu YXNzZXJ0UmFpc2VzUmVnZXhwKEV4Y2VwdGlvbiwgcidJbiBzZWN0aW9uICJNRVNTQUdFX1JVTEVT IiwgdGhlIGZvbGxvd2luZyBkZWZpbml0aW9ucyBhcmUgbm90IHVzZWQgYW5kIHNob3VsZCBiZSBy ZW1vdmVkOiBXYXRjaExpc3QxJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vs Zi5fd2F0Y2hfbGlzdF9wYXJzZXIucGFyc2UsIHdhdGNoX2xpc3QpCisgICAgICAgIE91dHB1dENh cHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLl93YXRjaF9saXN0X3BhcnNlci5wYXJz ZSwgYXJncz1bd2F0Y2hfbGlzdF0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBleHBlY3RlZF9sb2dzPSdJbiBzZWN0aW9uICJNRVNTQUdFX1JVTEVTIiwgdGhlIGZvbGxv d2luZyBkZWZpbml0aW9ucyBhcmUgbm90IHVzZWQgYW5kIHNob3VsZCBiZSByZW1vdmVkOiBXYXRj aExpc3QxXG4nKQogCiAgICAgZGVmIHRlc3RfY2NfcnVsZV93aXRoX3VuZGVmaW5lZF9kZWZpbnRp b25fd2l0aF9zdWdnZXN0aW9uKHNlbGYpOgogICAgICAgICB3YXRjaF9saXN0ID0gKApAQCAtMjAx LDYgKzIyMCw2IEBAIGNsYXNzIFdhdGNoTGlzdFBhcnNlclRlc3Qod2Via2l0dW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICAgICAgJyAgICAgfSwnCiAgICAgICAgICAgICAnfScpCiAKLSAgICAg ICAgc2VsZi5hc3NlcnRSYWlzZXNSZWdleHAoRXhjZXB0aW9uLCByJ0luIHNlY3Rpb24gIkNDX1JV TEVTIiwgdGhlIGZvbGxvd2luZyBkZWZpbml0aW9ucyBhcmUgbm90IHVzZWQgYW5kIHNob3VsZCBi ZSByZW1vdmVkOiBXYXRjaExpc3RccyonCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHInUGVyaGFwcyBpdCBzaG91bGQgYmUgV2F0Y2hMaXN0MVwuJywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2VsZi5fd2F0Y2hfbGlzdF9wYXJzZXIucGFyc2UsIHdhdGNoX2xpc3Qp CisgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLl93YXRj aF9saXN0X3BhcnNlci5wYXJzZSwgYXJncz1bd2F0Y2hfbGlzdF0sCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9sb2dzPSdJbiBzZWN0aW9uICJDQ19SVUxF UyIsIHRoZSBmb2xsb3dpbmcgZGVmaW5pdGlvbnMgYXJlIG5vdCB1c2VkIGFuZCBzaG91bGQgYmUg cmVtb3ZlZDogV2F0Y2hMaXN0JworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKyAnXG5cblBlcmhhcHMgaXQgc2hvdWxkIGJlIFdhdGNoTGlzdDEuXG4nKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHJ1bGUu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cnVs ZS5weQppbmRleCBkN2U2ZjdiZjFjMzkzNWUwOTkxZDJmNDgyN2Y1ZDQ3NGIyMzkwNGM0Li42OTg3 NTA4MWE3ZTczMmY0ZmQ5NWExZTg1ZTMzZTJiZjAwZjlmOTFiIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cnVsZS5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cnVsZS5weQpA QCAtNDEsMyArNDEsNiBAQCBjbGFzcyBXYXRjaExpc3RSdWxlOgogCiAgICAgZGVmIGluc3RydWN0 aW9ucyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2luc3RydWN0aW9ucworCisgICAgZGVm IHJlbW92ZV9pbnN0cnVjdGlvbihzZWxmLCBpbnN0cnVjdGlvbik6CisgICAgICAgIHNlbGYuX2lu c3RydWN0aW9ucy5yZW1vdmUoaW5zdHJ1Y3Rpb24pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cnVsZV91bml0dGVzdC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RydWxlX3VuaXR0 ZXN0LnB5CmluZGV4IGNiMjk4NWRjNWZmZjM0ZTJiMjBkODQzMTkzYzVlNzQ5NGU3ZjFmMjIuLjky YWFmMzRhYjE4N2E3ODE1NzlmZDU3NGFiMTJiOWI3ZDU1Mzc1MjQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RydWxlX3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxp c3RydWxlX3VuaXR0ZXN0LnB5CkBAIC0zMiwxMSArMzIsMTcgQEAgZnJvbSB3ZWJraXRweS5jb21t b24ud2F0Y2hsaXN0LndhdGNobGlzdHJ1bGUgaW1wb3J0IFdhdGNoTGlzdFJ1bGUKIAogCiBjbGFz cyBXYXRjaExpc3RSdWxlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0gICAgZGVmIHRlc3RfYWN0 aW9uX2xpc3Qoc2VsZik6CisgICAgZGVmIHRlc3RfaW5zdHJ1Y3Rpb25fbGlzdChzZWxmKToKICAg ICAgICAgaW5zdHJ1Y3Rpb25zID0gWydhJywgJ2InXQogICAgICAgICBydWxlID0gV2F0Y2hMaXN0 UnVsZSgnZGVmaW5pdGlvbjEnLCBpbnN0cnVjdGlvbnNbOl0pCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoaW5zdHJ1Y3Rpb25zLCBydWxlLmluc3RydWN0aW9ucygpKQogCisgICAgZGVmIHRlc3Rf cmVtb3ZlX2luc3RydWN0aW9uKHNlbGYpOgorICAgICAgICBpbnN0cnVjdGlvbnMgPSBbJ2EnLCAn YiddCisgICAgICAgIHJ1bGUgPSBXYXRjaExpc3RSdWxlKCdkZWZpbml0aW9uMScsIGluc3RydWN0 aW9uc1s6XSkKKyAgICAgICAgcnVsZS5yZW1vdmVfaW5zdHJ1Y3Rpb24oJ2InKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKFsnYSddLCBydWxlLmluc3RydWN0aW9ucygpKQorCiAgICAgZGVmIHRl c3Rfc2ltcGxlX2RlZmluaXRpb24oc2VsZik6CiAgICAgICAgIGRlZmluaXRpb25fbmFtZSA9ICdk ZWZpbml0aW9uMScKICAgICAgICAgcnVsZSA9IFdhdGNoTGlzdFJ1bGUoZGVmaW5pdGlvbl9uYW1l LCBbXSkK