68110 2011-09-14 13:24:09 -0700 committers.py should support multiple IRC nicknames 2011-09-14 13:57:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa abarth eric leandro paroga oldest_to_newest 467283 0 rniwa 2011-09-14 13:24:09 -0700 Some people list multiple IRC nicknames in http://trac.webkit.org/wiki/WebKit%20Team or ones that don't match with ones they listed in committers.py. We should support multiple IRC nicknames. 467287 1 107385 rniwa 2011-09-14 13:28:14 -0700 Created attachment 107385 Patch 467291 2 107385 eric 2011-09-14 13:33:52 -0700 Comment on attachment 107385 Patch OK. Do we need a .irc_nickname() accessor for the first one? 467292 3 rniwa 2011-09-14 13:34:46 -0700 (In reply to comment #2) > (From update of attachment 107385 [details]) > OK. Do we need a .irc_nickname() accessor for the first one? I've modified all call sites (only sheriffbot uses it) to support multiple nicknames. 467313 4 rniwa 2011-09-14 13:57:43 -0700 Committed r95118: <http://trac.webkit.org/changeset/95118> 107385 2011-09-14 13:28:14 -0700 2011-09-14 13:33:52 -0700 Patch bug-68110-20110914132812.patch text/plain 9949 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDk1MTE0KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTcgQEAKKzIwMTEtMDktMTQgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgY29tbWl0dGVycy5weSBzaG91bGQgc3VwcG9ydCBtdWx0aXBsZSBJUkMgbmlja25h bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODEx MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBt dWx0aXBsZSBJUkMgbmlja25hbWUgc3VwcG9ydCB0byBjb21taXR0ZXJzLnB5CisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVyc191bml0dGVzdC5weToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kLnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZi5weToKKwogMjAxMS0wOS0x NCAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IGdsb2Jh bEZsYWcgZm9yIFdlYktpdFRlc3RSdW5uZXIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5CShyZXZpc2lvbiA5NTEwNCkKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0yOSw5ICsyOSw4IEBACiAjCiAjIFdlYktpdCdzIFB5dGhvbiBtb2R1bGUg Zm9yIGNvbW1pdHRlciBhbmQgcmV2aWV3ZXIgdmFsaWRhdGlvbi4KIAotCiBjbGFzcyBDb250cmli dXRvcihvYmplY3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFp bHMsIGlyY19uaWNrbmFtZT1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1h aWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzPU5vbmUpOgogICAgICAgICBh c3NlcnQobmFtZSkKICAgICAgICAgYXNzZXJ0KGVtYWlsX29yX2VtYWlscykKICAgICAgICAgc2Vs Zi5mdWxsX25hbWUgPSBuYW1lCkBAIC0zOSw3ICszOCwxMCBAQCBjbGFzcyBDb250cmlidXRvcihv YmplY3QpOgogICAgICAgICAgICAgc2VsZi5lbWFpbHMgPSBbZW1haWxfb3JfZW1haWxzXQogICAg ICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5lbWFpbHMgPSBlbWFpbF9vcl9lbWFpbHMKLSAg ICAgICAgc2VsZi5pcmNfbmlja25hbWUgPSBpcmNfbmlja25hbWUKKyAgICAgICAgaWYgaXNpbnN0 YW5jZShpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzLCBzdHIpOgorICAgICAgICAgICAgc2VsZi5p cmNfbmlja25hbWVzID0gW2lyY19uaWNrbmFtZV9vcl9uaWNrbmFtZXNdCisgICAgICAgIGVsc2U6 CisgICAgICAgICAgICBzZWxmLmlyY19uaWNrbmFtZXMgPSBpcmNfbmlja25hbWVfb3Jfbmlja25h bWVzCiAgICAgICAgIHNlbGYuY2FuX2NvbW1pdCA9IEZhbHNlCiAgICAgICAgIHNlbGYuY2FuX3Jl dmlldyA9IEZhbHNlCiAKQEAgLTU1LDggKzU3LDEwIEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVj dCk6CiAgICAgICAgIHN0cmluZyA9IHNlYXJjaF9zdHJpbmcubG93ZXIoKQogICAgICAgICBpZiBz dHJpbmcgaW4gc2VsZi5mdWxsX25hbWUubG93ZXIoKToKICAgICAgICAgICAgIHJldHVybiBUcnVl Ci0gICAgICAgIGlmIHNlbGYuaXJjX25pY2tuYW1lIGFuZCBzdHJpbmcgaW4gc2VsZi5pcmNfbmlj a25hbWUubG93ZXIoKToKLSAgICAgICAgICAgIHJldHVybiBUcnVlCisgICAgICAgIGlmIHNlbGYu aXJjX25pY2tuYW1lczoKKyAgICAgICAgICAgIGZvciBuaWNrbmFtZSBpbiBzZWxmLmlyY19uaWNr bmFtZXM6CisgICAgICAgICAgICAgICAgaWYgc3RyaW5nIGluIG5pY2tuYW1lLmxvd2VyKCk6Cisg ICAgICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCiAgICAgICAgIGZvciBlbWFpbCBpbiBzZWxm LmVtYWlsczoKICAgICAgICAgICAgIGlmIHN0cmluZyBpbiBlbWFpbC5sb3dlcigpOgogICAgICAg ICAgICAgICAgIHJldHVybiBUcnVlCkBAIC0zNjcsNyArMzcxLDcgQEAgcmV2aWV3ZXJzX2xpc3Qg PSBbCiAgICAgUmV2aWV3ZXIoIkpvc2VwaCBQZWNvcmFybyIsIFsiam9lcGVja0B3ZWJraXQub3Jn IiwgInBlY29yYXJvQGFwcGxlLmNvbSJdLCAiSm9lUGVjayIpLAogICAgIFJldmlld2VyKCJKdXN0 aW4gR2FyY2lhIiwgImp1c3Rpbi5nYXJjaWFAYXBwbGUuY29tIiwgImp1c3RpbmciKSwKICAgICBS ZXZpZXdlcigiS2VuIEtvY2llbmRhIiwgImtvY2llbmRhQGFwcGxlLmNvbSIpLAotICAgIFJldmll d2VyKCJLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiIsIFsia2VubmV0aEB3ZWJraXQub3JnIiwg Imtlbm5ldGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmciLCAia2VubmV0aC5jaHJpc3RpYW5z ZW5AZ21haWwuY29tIl0sICJrZW5uZSIpLAorICAgIFJldmlld2VyKCJLZW5uZXRoIFJvaGRlIENo cmlzdGlhbnNlbiIsIFsia2VubmV0aEB3ZWJraXQub3JnIiwgImtlbm5ldGguY2hyaXN0aWFuc2Vu QG9wZW5ib3NzYS5vcmciLCAia2VubmV0aC5jaHJpc3RpYW5zZW5AZ21haWwuY29tIl0sIFsia2Vu bmUiLCAia2VubmV0aCJdKSwKICAgICBSZXZpZXdlcigiS2VubmV0aCBSdXNzZWxsIiwgImtickBn b29nbGUuY29tIiwgImticl9nb29nbGUiKSwKICAgICBSZXZpZXdlcigiS2VudCBUYW11cmEiLCAi dGtlbnRAY2hyb21pdW0ub3JnIiwgInRrZW50IiksCiAgICAgUmV2aWV3ZXIoIktldmluIERlY2tl ciIsICJrZGVja2VyQGFwcGxlLmNvbSIsICJzdXBlcmtldmluIiksCkBAIC0zODAsMTMgKzM4NCwx MyBAQCByZXZpZXdlcnNfbGlzdCA9IFsKICAgICBSZXZpZXdlcigiTWFyayBSb3dlIiwgIm1yb3dl QGFwcGxlLmNvbSIsICJiZGFzaCIpLAogICAgIFJldmlld2VyKCJNYXJ0aW4gUm9iaW5zb24iLCBb Im1yb2JpbnNvbkB3ZWJraXQub3JnIiwgIm1yb2JpbnNvbkBpZ2FsaWEuY29tIiwgIm1hcnRpbi5q YW1lcy5yb2JpbnNvbkBnbWFpbC5jb20iXSwgIm1yb2JpbnNvbiIpLAogICAgIFJldmlld2VyKCJN aWhhaSBQYXJwYXJpdGEiLCAibWloYWlwQGNocm9taXVtLm9yZyIsICJtaWhhaXAiKSwKLSAgICBS ZXZpZXdlcigiTmF0ZSBDaGFwaW4iLCAiamFwaGV0QGNocm9taXVtLm9yZyIsICJqYXBoZXQiKSwK KyAgICBSZXZpZXdlcigiTmF0ZSBDaGFwaW4iLCAiamFwaGV0QGNocm9taXVtLm9yZyIsIFsiamFw aGV0IiwgIm5hdGVjaGFwaW4iXSksCiAgICAgUmV2aWV3ZXIoIk5pa29sYXMgWmltbWVybWFubiIs IFsiemltbWVybWFubkBrZGUub3JnIiwgInppbW1lcm1hbm5AcGh5c2lrLnJ3dGgtYWFjaGVuLmRl IiwgInppbW1lcm1hbm5Ad2Via2l0Lm9yZyJdLCAid2lsZGZveCIpLAogICAgIFJldmlld2VyKCJO b2FtIFJvc2VudGhhbCIsICJub2FtLnJvc2VudGhhbEBub2tpYS5jb20iLCAibm9hbXIiKSwKICAg ICBSZXZpZXdlcigiT2phbiBWYWZhaSIsICJvamFuQGNocm9taXVtLm9yZyIsICJvamFuIiksCiAg ICAgUmV2aWV3ZXIoIk9saXZlciBIdW50IiwgIm9saXZlckBhcHBsZS5jb20iLCAib2xsaWVqIiks CiAgICAgUmV2aWV3ZXIoIlBhdmVsIEZlbGRtYW4iLCAicGZlbGRtYW5AY2hyb21pdW0ub3JnIiwg InBmZWxkbWFuIiksCi0gICAgUmV2aWV3ZXIoIlBoaWxpcHBlIE5vcm1hbmQiLCBbInBub3JtYW5k QGlnYWxpYS5jb20iLCAicGhpbG5Ad2Via2l0Lm9yZyIsICJwaGlsbkBpZ2FsaWEuY29tIl0sICJw aGlsbi10cCIpLAorICAgIFJldmlld2VyKCJQaGlsaXBwZSBOb3JtYW5kIiwgWyJwbm9ybWFuZEBp Z2FsaWEuY29tIiwgInBoaWxuQHdlYmtpdC5vcmciLCAicGhpbG5AaWdhbGlhLmNvbSJdLCBbInBo aWxuLXRwIiwgInBub3JtYW5kIl0pLAogICAgIFJldmlld2VyKCJSaWNoYXJkIFdpbGxpYW1zb24i LCAicmp3QGFwcGxlLmNvbSIsICJyanciKSwKICAgICBSZXZpZXdlcigiUm9iIEJ1aXMiLCBbInJ3 bGJ1aXNAZ21haWwuY29tIiwgInJ3bGJ1aXNAd2Via2l0Lm9yZyJdLCAicndsYnVpcyIpLAogICAg IFJldmlld2VyKCJSeW9zdWtlIE5pd2EiLCAicm5pd2FAd2Via2l0Lm9yZyIsICJybml3YSIpLApA QCAtNDYyLDcgKzQ2Niw3IEBAIGNsYXNzIENvbW1pdHRlckxpc3Qob2JqZWN0KToKIAogICAgIGRl ZiBjb250cmlidXRvcl9ieV9pcmNfbmlja25hbWUoc2VsZiwgaXJjX25pY2tuYW1lKToKICAgICAg ICAgZm9yIGNvbnRyaWJ1dG9yIGluIHNlbGYuY29udHJpYnV0b3JzKCk6Ci0gICAgICAgICAgICBp ZiBjb250cmlidXRvci5pcmNfbmlja25hbWUgYW5kIGNvbnRyaWJ1dG9yLmlyY19uaWNrbmFtZSA9 PSBpcmNfbmlja25hbWU6CisgICAgICAgICAgICBpZiBjb250cmlidXRvci5pcmNfbmlja25hbWVz IGFuZCBpcmNfbmlja25hbWUgaW4gY29udHJpYnV0b3IuaXJjX25pY2tuYW1lczoKICAgICAgICAg ICAgICAgICByZXR1cm4gY29udHJpYnV0b3IKICAgICAgICAgcmV0dXJuIE5vbmUKIApJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnNfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2Nv bW1pdHRlcnNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDk1MTA0KQorKysgVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29w eSkKQEAgLTM0LDcgKzM0LDggQEAgY2xhc3MgQ29tbWl0dGVyc1Rlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICBjb21taXR0ZXIgPSBDb21taXR0ZXIoJ1Rlc3QgT25lJywgJ29uZUB0ZXN0 LmNvbScsICdvbmUnKQogICAgICAgICByZXZpZXdlciA9IFJldmlld2VyKCdUZXN0IFR3bycsIFsn dHdvQHRlc3QuY29tJywgJ3R3b0ByYWQuY29tJywgJ3NvX3R3b0BnbWFpbC5jb20nXSkKICAgICAg ICAgY29udHJpYnV0b3IgPSBDb250cmlidXRvcignVGVzdCBUaHJlZScsIFsndGhyZWVAdGVzdC5j b20nXSwgJ3RocmVlJykKLSAgICAgICAgY29tbWl0dGVyX2xpc3QgPSBDb21taXR0ZXJMaXN0KGNv bW1pdHRlcnM9W2NvbW1pdHRlcl0sIHJldmlld2Vycz1bcmV2aWV3ZXJdLCBjb250cmlidXRvcnM9 W2NvbnRyaWJ1dG9yXSkKKyAgICAgICAgY29udHJpYnV0b3Jfd2l0aF90d29fbmlja25hbWVzID0g Q29udHJpYnV0b3IoJ090aGVyIEZvdXInLCBbJ290aGVyZm91ckB3ZWJraXQub3JnJ10sIFsnZm91 cicsICdvdGhlcmZvdXInXSkKKyAgICAgICAgY29tbWl0dGVyX2xpc3QgPSBDb21taXR0ZXJMaXN0 KGNvbW1pdHRlcnM9W2NvbW1pdHRlcl0sIHJldmlld2Vycz1bcmV2aWV3ZXJdLCBjb250cmlidXRv cnM9W2NvbnRyaWJ1dG9yLCBjb250cmlidXRvcl93aXRoX3R3b19uaWNrbmFtZXNdKQogCiAgICAg ICAgICMgVGVzdCB2YWxpZCBjb21taXR0ZXIsIHJldmlld2VyIGFuZCBjb250cmlidXRvciBsb29r dXAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlf ZW1haWwoJ29uZUB0ZXN0LmNvbScpLCBjb21taXR0ZXIpCkBAIC02NiwxMiArNjcsMTQgQEAgY2xh c3MgQ29tbWl0dGVyc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAjIFRlc3QgdGhh dCBlbWFpbHMgcmV0dXJucyBhIGxpc3QuCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0 dGVyLmVtYWlscywgWydvbmVAdGVzdC5jb20nXSkKIAotICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNvbW1pdHRlci5pcmNfbmlja25hbWUsICdvbmUnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNvbW1pdHRlci5pcmNfbmlja25hbWVzLCBbJ29uZSddKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGNvbW1pdHRlcl9saXN0LmNvbnRyaWJ1dG9yX2J5X2lyY19uaWNrbmFtZSgnb25lJyksIGNv bW1pdHRlcikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb250cmli dXRvcl9ieV9pcmNfbmlja25hbWUoJ3RocmVlJyksIGNvbnRyaWJ1dG9yKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbnRyaWJ1dG9yX2J5X2lyY19uaWNrbmFtZSgn Zm91cicpLCBjb250cmlidXRvcl93aXRoX3R3b19uaWNrbmFtZXMpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfaXJjX25pY2tuYW1lKCdvdGhl cmZvdXInKSwgY29udHJpYnV0b3Jfd2l0aF90d29fbmlja25hbWVzKQogCiAgICAgICAgICMgVGVz dCB0aGF0IHRoZSBsaXN0cyByZXR1cm5lZCBhcmUgYXJlIHdlIGV4cGVjdCB0aGVtLgotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbnRyaWJ1dG9ycygpLCBbY29udHJp YnV0b3IsIGNvbW1pdHRlciwgcmV2aWV3ZXJdKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNv bW1pdHRlcl9saXN0LmNvbnRyaWJ1dG9ycygpLCBbY29udHJpYnV0b3IsIGNvbnRyaWJ1dG9yX3dp dGhfdHdvX25pY2tuYW1lcywgY29tbWl0dGVyLCByZXZpZXdlcl0pCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVycygpLCBbY29tbWl0dGVyLCByZXZpZXdl cl0pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QucmV2aWV3ZXJzKCks IFtyZXZpZXdlcl0pCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJj X2NvbW1hbmQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Jv dC9pcmNfY29tbWFuZC5weQkocmV2aXNpb24gOTUxMDQpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvYm90L2lyY19jb21tYW5kLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNzMsOCArMTcz LDggQEAgY2xhc3MgSGkoSVJDQ29tbWFuZCk6CiAKIGNsYXNzIFdob2lzKElSQ0NvbW1hbmQpOgog ICAgIGRlZiBfbmlja19vcl9mdWxsX3JlY29yZChzZWxmLCBjb250cmlidXRvcik6Ci0gICAgICAg IGlmIGNvbnRyaWJ1dG9yLmlyY19uaWNrbmFtZToKLSAgICAgICAgICAgIHJldHVybiBjb250cmli dXRvci5pcmNfbmlja25hbWUKKyAgICAgICAgaWYgY29udHJpYnV0b3IuaXJjX25pY2tuYW1lczoK KyAgICAgICAgICAgIHJldHVybiAnLCAnLmpvaW4oY29udHJpYnV0b3IuaXJjX25pY2tuYW1lcykK ICAgICAgICAgcmV0dXJuIHVuaWNvZGUoY29udHJpYnV0b3IpCiAKICAgICBkZWYgZXhlY3V0ZShz ZWxmLCBuaWNrLCBhcmdzLCB0b29sLCBzaGVyaWZmKToKQEAgLTE4OSwxMyArMTg5LDEzIEBAIGNs YXNzIFdob2lzKElSQ0NvbW1hbmQpOgogICAgICAgICAgICAgcmV0dXJuICIlczogTW9yZSB0aGFu IDUgY29udHJpYnV0b3JzIG1hdGNoICclcycsIGNvdWxkIHlvdSBiZSBtb3JlIHNwZWNpZmljPyIg JSAobmljaywgc2VhcmNoX3N0cmluZykKICAgICAgICAgaWYgbGVuKGNvbnRyaWJ1dG9ycykgPT0g MToKICAgICAgICAgICAgIGNvbnRyaWJ1dG9yID0gY29udHJpYnV0b3JzWzBdCi0gICAgICAgICAg ICBpZiBub3QgY29udHJpYnV0b3IuaXJjX25pY2tuYW1lOgorICAgICAgICAgICAgaWYgbm90IGNv bnRyaWJ1dG9yLmlyY19uaWNrbmFtZXM6CiAgICAgICAgICAgICAgICAgcmV0dXJuICIlczogJXMg aGFzbid0IHRvbGQgbWUgdGhlaXIgbmljay4gQm9vIGhvbyA6LSgiICUgKG5pY2ssIGNvbnRyaWJ1 dG9yKQogICAgICAgICAgICAgaWYgY29udHJpYnV0b3IuZW1haWxzIGFuZCBzZWFyY2hfc3RyaW5n Lmxvd2VyKCkgbm90IGluIG1hcChsYW1iZGEgZW1haWw6IGVtYWlsLmxvd2VyKCksIGNvbnRyaWJ1 dG9yLmVtYWlscyk6CiAgICAgICAgICAgICAgICAgZm9ybWF0dGVkRW1haWxzID0gJywgJy5qb2lu KGNvbnRyaWJ1dG9yLmVtYWlscykKLSAgICAgICAgICAgICAgICByZXR1cm4gIiVzOiAlcyBpcyAl cyAoJXMpLiBXaHkgZG8geW91IGFzaz8iICUgKG5pY2ssIHNlYXJjaF9zdHJpbmcsIGNvbnRyaWJ1 dG9yLmlyY19uaWNrbmFtZSwgZm9ybWF0dGVkRW1haWxzKQorICAgICAgICAgICAgICAgIHJldHVy biAiJXM6ICVzIGlzICVzICglcykuIFdoeSBkbyB5b3UgYXNrPyIgJSAobmljaywgc2VhcmNoX3N0 cmluZywgc2VsZi5fbmlja19vcl9mdWxsX3JlY29yZChjb250cmlidXRvciksIGZvcm1hdHRlZEVt YWlscykKICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgcmV0dXJuICIlczogJXMg aXMgJXMuIFdoeSBkbyB5b3UgYXNrPyIgJSAobmljaywgc2VhcmNoX3N0cmluZywgY29udHJpYnV0 b3IuaXJjX25pY2tuYW1lKQorICAgICAgICAgICAgICAgIHJldHVybiAiJXM6ICVzIGlzICVzLiBX aHkgZG8geW91IGFzaz8iICUgKG5pY2ssIHNlYXJjaF9zdHJpbmcsIHNlbGYuX25pY2tfb3JfZnVs bF9yZWNvcmQoY29udHJpYnV0b3IpKQogICAgICAgICBjb250cmlidXRvcl9uaWNrcyA9IG1hcChz ZWxmLl9uaWNrX29yX2Z1bGxfcmVjb3JkLCBjb250cmlidXRvcnMpCiAgICAgICAgIGNvbnRyaWJ1 dG9yc19zdHJpbmcgPSBqb2luX3dpdGhfc2VwYXJhdG9ycyhjb250cmlidXRvcl9uaWNrcywgb25s eV90d29fc2VwYXJhdG9yPSIgb3IgIiwgbGFzdF9zZXBhcmF0b3I9Jywgb3IgJykKICAgICAgICAg cmV0dXJuICIlczogSSdtIG5vdCBzdXJlIHdobyB5b3UgbWVhbj8gICVzIGNvdWxkIGJlICclcycu IiAlIChuaWNrLCBjb250cmlidXRvcnNfc3RyaW5nLCBzZWFyY2hfc3RyaW5nKQpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9zaGVyaWZmLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZi5weQkocmV2aXNpb24gOTUxMDQp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L3NoZXJpZmYucHkJKHdvcmtpbmcg Y29weSkKQEAgLTM5LDcgKzM5LDggQEAgY2xhc3MgU2hlcmlmZihvYmplY3QpOgogICAgICAgICBz ZWxmLl9zaGVyaWZmYm90ID0gc2hlcmlmZmJvdAogCiAgICAgZGVmIHJlc3BvbnNpYmxlX25pY2tu YW1lc19mcm9tX2NvbW1pdF9pbmZvKHNlbGYsIGNvbW1pdF9pbmZvKToKLSAgICAgICAgcmV0dXJu IFtwYXJ0eS5pcmNfbmlja25hbWUgZm9yIHBhcnR5IGluIGNvbW1pdF9pbmZvLnJlc3BvbnNpYmxl X3BhcnRpZXMoKSBpZiBwYXJ0eS5pcmNfbmlja25hbWVdCisgICAgICAgIG5lc3RlZExpc3QgPSBb cGFydHkuaXJjX25pY2tuYW1lcyBmb3IgcGFydHkgaW4gY29tbWl0X2luZm8ucmVzcG9uc2libGVf cGFydGllcygpIGlmIHBhcnR5LmlyY19uaWNrbmFtZXNdCisgICAgICAgIHJldHVybiByZWR1Y2Uo bGFtYmRhIGxpc3QsIGNoaWxkTGlzdDogbGlzdCArIGNoaWxkTGlzdCwgbmVzdGVkTGlzdCkKIAog ICAgIGRlZiBwb3N0X2lyY193YXJuaW5nKHNlbGYsIGNvbW1pdF9pbmZvLCBidWlsZGVycyk6CiAg ICAgICAgIGlyY19uaWNrbmFtZXMgPSBzb3J0ZWQoc2VsZi5yZXNwb25zaWJsZV9uaWNrbmFtZXNf ZnJvbV9jb21taXRfaW5mbyhjb21taXRfaW5mbykpCg==