202468 2019-10-02 08:42:17 -0700 Python 3: Add support in webkitpy.common.net.irc 2019-10-16 15:48:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=202464 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue dewei_zhu ews-watchlist glenn jbedard slewis webkit-bug-importer oldest_to_newest 1576002 0 jbedard 2019-10-02 08:42:17 -0700 Add webkitpy.common.net.irc to test-webkitpy-python3 1580576 1 381084 jbedard 2019-10-16 10:42:37 -0700 Created attachment 381084 Patch 1580737 2 381084 commit-queue 2019-10-16 15:47:47 -0700 Comment on attachment 381084 Patch Clearing flags on attachment: 381084 Committed r251214: <https://trac.webkit.org/changeset/251214> 1580738 3 commit-queue 2019-10-16 15:47:48 -0700 All reviewed patches have been landed. Closing bug. 1580740 4 webkit-bug-importer 2019-10-16 15:48:16 -0700 <rdar://problem/56350203> 381084 2019-10-16 10:42:37 -0700 2019-10-16 15:47:47 -0700 Patch bug-202468-20191016104236.patch text/plain 11009 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTE5MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDE5LTEwLTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQeXRob24gMzogQWRkIHN1cHBvcnQgaW4gd2Via2l0cHkuY29tbW9uLm5l dC5idWd6aWxsYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjAyNDY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTWFrZSB0aGUgaXJjIGxpYnJhcnkgd2UgdXNlIFB5dGhvbiAzIGNvbXBhdGlibGUuCisKKyAg ICAgICAgKiBTY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMzogQWRkIHdlYmtpdHB5LmNvbW1v bi5uZXQuYnVnemlsbGEgdG8gdGhlIHRlc3QgbGlzdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3RoaXJkcGFydHkvaXJjL2lyY2JvdC5weTogVXNlIGZ1bGwgaW1wb3J0IHBhdGhzLgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9pcmMvaXJjbGliLnB5OiBGaXggZXhj ZXB0aW9ucywgcHJpbnRpbmcgZm9yIFB5dGhvbiAzLgorICAgICAgICAoQ29ubmVjdGlvbi5fZ2V0 X3NvY2tldCk6IAorICAgICAgICAoU2VydmVyQ29ubmVjdGlvbi5jb25uZWN0KToKKyAgICAgICAg KFNlcnZlckNvbm5lY3Rpb24ucHJvY2Vzc19kYXRhKToKKyAgICAgICAgKFNlcnZlckNvbm5lY3Rp b24uZGlzY29ubmVjdCk6CisgICAgICAgIChTZXJ2ZXJDb25uZWN0aW9uLnNlbmRfcmF3KToKKyAg ICAgICAgKERDQ0Nvbm5lY3Rpb24uY29ubmVjdCk6CisgICAgICAgIChEQ0NDb25uZWN0aW9uLmxp c3Rlbik6CisgICAgICAgIChEQ0NDb25uZWN0aW9uLmRpc2Nvbm5lY3QpOgorICAgICAgICAoREND Q29ubmVjdGlvbi5wcm9jZXNzX2RhdGEpOgorICAgICAgICAoRENDQ29ubmVjdGlvbi5wcml2bXNn KToKKwogMjAxOS0xMC0xNiAgUGFibG8gU2FhdmVkcmEgIDxwc2FhdmVkcmFAaWdhbGlhLmNvbT4K IAogICAgICAgICBbVG9vbHNdIEFkZCBhIGRyaXZlciBmb3IgY29nIGZvciBiZW5jaG1hcmtfcnVu bmVyLnB5CkluZGV4OiBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwkocmV2aXNpb24gMjUx MTY1KQorKysgVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5LXB5dGhvbjMJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDYgKzM1LDcgQEAgUFlUSE9OM19DT01QQVRJQkxFX0RJUkVDVE9SSUVTID0gWwog ICAnd2Via2l0cHkuY29tbW9uLnN5c3RlbScsCiAgICd3ZWJraXRweS5jb21tb24udGhyZWFkJywK ICAgJ3dlYmtpdHB5LmNvbW1vbi5uZXQuYnVnemlsbGEnLAorICAnd2Via2l0cHkuY29tbW9uLm5l dC5pcmMnLAogXQogCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9p cmMvaXJjYm90LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRw YXJ0eS9pcmMvaXJjYm90LnB5CShyZXZpc2lvbiAyNTExNjUpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3RoaXJkcGFydHkvaXJjL2lyY2JvdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjUsMTIg KzI1LDE2IEBAIHdyaXRlIHNpbXBsZXIgYm90cy4KICIiIgogCiBpbXBvcnQgc3lzCi1mcm9tIFVz ZXJEaWN0IGltcG9ydCBVc2VyRGljdAogCi1mcm9tIGlyY2xpYiBpbXBvcnQgU2ltcGxlSVJDQ2xp ZW50Ci1mcm9tIGlyY2xpYiBpbXBvcnQgbm1fdG9fbiwgaXJjX2xvd2VyLCBhbGxfZXZlbnRzCi1m cm9tIGlyY2xpYiBpbXBvcnQgcGFyc2VfY2hhbm5lbF9tb2RlcywgaXNfY2hhbm5lbAotZnJvbSBp cmNsaWIgaW1wb3J0IFNlcnZlckNvbm5lY3Rpb25FcnJvcgoraWYgc3lzLnZlcnNpb25faW5mbyA+ ICgzLCAwKToKKyAgICBmcm9tIGNvbGxlY3Rpb25zIGltcG9ydCBVc2VyRGljdAorZWxzZToKKyAg ICBmcm9tIFVzZXJEaWN0IGltcG9ydCBVc2VyRGljdAorCitmcm9tIHdlYmtpdHB5LnRoaXJkcGFy dHkuaXJjLmlyY2xpYiBpbXBvcnQgU2ltcGxlSVJDQ2xpZW50Citmcm9tIHdlYmtpdHB5LnRoaXJk cGFydHkuaXJjLmlyY2xpYiBpbXBvcnQgbm1fdG9fbiwgaXJjX2xvd2VyLCBhbGxfZXZlbnRzCitm cm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuaXJjLmlyY2xpYiBpbXBvcnQgcGFyc2VfY2hhbm5lbF9t b2RlcywgaXNfY2hhbm5lbAorZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmlyYy5pcmNsaWIgaW1w b3J0IFNlcnZlckNvbm5lY3Rpb25FcnJvcgogCiBjbGFzcyBTaW5nbGVTZXJ2ZXJJUkNCb3QoU2lt cGxlSVJDQ2xpZW50KToKICAgICAiIiJBIHNpbmdsZS1zZXJ2ZXIgSVJDIGJvdCBjbGFzcy4KSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9pcmMvaXJjbGliLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9pcmMvaXJjbGliLnB5 CShyZXZpc2lvbiAyNTExNjUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkv aXJjL2lyY2xpYi5weQkod29ya2luZyBjb3B5KQpAQCAtMzQyLDcgKzM0Miw3IEBAIGNsYXNzIENv bm5lY3Rpb246CiAgICAgICAgIHNlbGYuaXJjbGlib2JqID0gaXJjbGlib2JqCiAKICAgICBkZWYg X2dldF9zb2NrZXQoKToKLSAgICAgICAgcmFpc2UgSVJDRXJyb3IsICJOb3Qgb3ZlcnJpZGRlbiIK KyAgICAgICAgcmFpc2UgSVJDRXJyb3IoIk5vdCBvdmVycmlkZGVuIikKIAogICAgICMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogICAgICMjIyBDb252ZW5pZW5jZSB3cmFwcGVycy4KQEAg LTQzMywxMCArNDMzLDEwIEBAIGNsYXNzIFNlcnZlckNvbm5lY3Rpb24oQ29ubmVjdGlvbik6CiAg ICAgICAgICAgICBzZWxmLnNvY2tldC5jb25uZWN0KChzZWxmLnNlcnZlciwgc2VsZi5wb3J0KSkK ICAgICAgICAgICAgIGlmIHNzbDoKICAgICAgICAgICAgICAgICBzZWxmLnNzbCA9IHNvY2tldC5z c2woc2VsZi5zb2NrZXQpCi0gICAgICAgIGV4Y2VwdCBzb2NrZXQuZXJyb3IsIHg6CisgICAgICAg IGV4Y2VwdCBzb2NrZXQuZXJyb3IgYXMgeDoKICAgICAgICAgICAgIHNlbGYuc29ja2V0LmNsb3Nl KCkKICAgICAgICAgICAgIHNlbGYuc29ja2V0ID0gTm9uZQotICAgICAgICAgICAgcmFpc2UgU2Vy dmVyQ29ubmVjdGlvbkVycm9yLCAiQ291bGRuJ3QgY29ubmVjdCB0byBzb2NrZXQ6ICVzIiAlIHgK KyAgICAgICAgICAgIHJhaXNlIFNlcnZlckNvbm5lY3Rpb25FcnJvcigiQ291bGRuJ3QgY29ubmVj dCB0byBzb2NrZXQ6ICVzIiAlIHgpCiAgICAgICAgIHNlbGYuY29ubmVjdGVkID0gMQogICAgICAg ICBpZiBzZWxmLmlyY2xpYm9iai5mbl90b19hZGRfc29ja2V0OgogICAgICAgICAgICAgc2VsZi5p cmNsaWJvYmouZm5fdG9fYWRkX3NvY2tldChzZWxmLnNvY2tldCkKQEAgLTQ5MSw3ICs0OTEsNyBA QCBjbGFzcyBTZXJ2ZXJDb25uZWN0aW9uKENvbm5lY3Rpb24pOgogICAgICAgICAgICAgICAgIG5l d19kYXRhID0gc2VsZi5zc2wucmVhZCgyKioxNCkKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAg ICAgICAgICAgbmV3X2RhdGEgPSBzZWxmLnNvY2tldC5yZWN2KDIqKjE0KQotICAgICAgICBleGNl cHQgc29ja2V0LmVycm9yLCB4OgorICAgICAgICBleGNlcHQgc29ja2V0LmVycm9yOgogICAgICAg ICAgICAgIyBUaGUgc2VydmVyIGh1bmcgdXAuCiAgICAgICAgICAgICBzZWxmLmRpc2Nvbm5lY3Qo IkNvbm5lY3Rpb24gcmVzZXQgYnkgcGVlciIpCiAgICAgICAgICAgICByZXR1cm4KQEAgLTUwNyw3 ICs1MDcsNyBAQCBjbGFzcyBTZXJ2ZXJDb25uZWN0aW9uKENvbm5lY3Rpb24pOgogCiAgICAgICAg IGZvciBsaW5lIGluIGxpbmVzOgogICAgICAgICAgICAgaWYgREVCVUc6Ci0gICAgICAgICAgICAg ICAgcHJpbnQgIkZST00gU0VSVkVSOiIsIGxpbmUKKyAgICAgICAgICAgICAgICBwcmludCgiRlJP TSBTRVJWRVI6IiwgbGluZSkKIAogICAgICAgICAgICAgaWYgbm90IGxpbmU6CiAgICAgICAgICAg ICAgICAgY29udGludWUKQEAgLTU2OSwxNSArNTY5LDEzIEBAIGNsYXNzIFNlcnZlckNvbm5lY3Rp b24oQ29ubmVjdGlvbik6CiAKICAgICAgICAgICAgICAgICAgICAgICAgIG0gPSBsaXN0KG0pCiAg ICAgICAgICAgICAgICAgICAgICAgICBpZiBERUJVRzoKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcmludCAiY29tbWFuZDogJXMsIHNvdXJjZTogJXMsIHRhcmdldDogJXMsIGFyZ3VtZW50 czogJXMiICUgKAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kLCBwcmVm aXgsIHRhcmdldCwgbSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmludCgiY29tbWFu ZDogJXMsIHNvdXJjZTogJXMsIHRhcmdldDogJXMsIGFyZ3VtZW50czogJXMiICUgKGNvbW1hbmQs IHByZWZpeCwgdGFyZ2V0LCBtKSkKICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2hhbmRs ZV9ldmVudChFdmVudChjb21tYW5kLCBwcmVmaXgsIHRhcmdldCwgbSkpCiAgICAgICAgICAgICAg ICAgICAgICAgICBpZiBjb21tYW5kID09ICJjdGNwIiBhbmQgbVswXSA9PSAiQUNUSU9OIjoKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9oYW5kbGVfZXZlbnQoRXZlbnQoImFjdGlv biIsIHByZWZpeCwgdGFyZ2V0LCBtWzE6XSkpCiAgICAgICAgICAgICAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICAgICAgICAgICAgICBpZiBERUJVRzoKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcmludCAiY29tbWFuZDogJXMsIHNvdXJjZTogJXMsIHRhcmdldDogJXMsIGFyZ3VtZW50 czogJXMiICUgKAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kLCBwcmVm aXgsIHRhcmdldCwgW21dKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaW50KCJjb21t YW5kOiAlcywgc291cmNlOiAlcywgdGFyZ2V0OiAlcywgYXJndW1lbnRzOiAlcyIgJSAoY29tbWFu ZCwgcHJlZml4LCB0YXJnZXQsIFttXSkpCiAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9o YW5kbGVfZXZlbnQoRXZlbnQoY29tbWFuZCwgcHJlZml4LCB0YXJnZXQsIFttXSkpCiAgICAgICAg ICAgICBlbHNlOgogICAgICAgICAgICAgICAgIHRhcmdldCA9IE5vbmUKQEAgLTU5NSw4ICs1OTMs NyBAQCBjbGFzcyBTZXJ2ZXJDb25uZWN0aW9uKENvbm5lY3Rpb24pOgogICAgICAgICAgICAgICAg ICAgICAgICAgY29tbWFuZCA9ICJ1bW9kZSIKIAogICAgICAgICAgICAgICAgIGlmIERFQlVHOgot ICAgICAgICAgICAgICAgICAgICBwcmludCAiY29tbWFuZDogJXMsIHNvdXJjZTogJXMsIHRhcmdl dDogJXMsIGFyZ3VtZW50czogJXMiICUgKAotICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFu ZCwgcHJlZml4LCB0YXJnZXQsIGFyZ3VtZW50cykKKyAgICAgICAgICAgICAgICAgICAgcHJpbnQo ImNvbW1hbmQ6ICVzLCBzb3VyY2U6ICVzLCB0YXJnZXQ6ICVzLCBhcmd1bWVudHM6ICVzIiAlIChj b21tYW5kLCBwcmVmaXgsIHRhcmdldCwgYXJndW1lbnRzKSkKICAgICAgICAgICAgICAgICBzZWxm Ll9oYW5kbGVfZXZlbnQoRXZlbnQoY29tbWFuZCwgcHJlZml4LCB0YXJnZXQsIGFyZ3VtZW50cykp CiAKICAgICBkZWYgX2hhbmRsZV9ldmVudChzZWxmLCBldmVudCk6CkBAIC02NjAsNyArNjU3LDcg QEAgY2xhc3MgU2VydmVyQ29ubmVjdGlvbihDb25uZWN0aW9uKToKIAogICAgICAgICB0cnk6CiAg ICAgICAgICAgICBzZWxmLnNvY2tldC5jbG9zZSgpCi0gICAgICAgIGV4Y2VwdCBzb2NrZXQuZXJy b3IsIHg6CisgICAgICAgIGV4Y2VwdCBzb2NrZXQuZXJyb3I6CiAgICAgICAgICAgICBwYXNzCiAg ICAgICAgIHNlbGYuc29ja2V0ID0gTm9uZQogICAgICAgICBzZWxmLl9oYW5kbGVfZXZlbnQoRXZl bnQoImRpc2Nvbm5lY3QiLCBzZWxmLnNlcnZlciwgIiIsIFttZXNzYWdlXSkpCkBAIC03ODIsMTUg Kzc3OSwxNSBAQCBjbGFzcyBTZXJ2ZXJDb25uZWN0aW9uKENvbm5lY3Rpb24pOgogICAgICAgICBU aGUgc3RyaW5nIHdpbGwgYmUgcGFkZGVkIHdpdGggYXBwcm9wcmlhdGUgQ1IgTEYuCiAgICAgICAg ICIiIgogICAgICAgICBpZiBzZWxmLnNvY2tldCBpcyBOb25lOgotICAgICAgICAgICAgcmFpc2Ug U2VydmVyTm90Q29ubmVjdGVkRXJyb3IsICJOb3QgY29ubmVjdGVkLiIKKyAgICAgICAgICAgIHJh aXNlIFNlcnZlck5vdENvbm5lY3RlZEVycm9yKCJOb3QgY29ubmVjdGVkLiIpCiAgICAgICAgIHRy eToKICAgICAgICAgICAgIGlmIHNlbGYuc3NsOgogICAgICAgICAgICAgICAgIHNlbGYuc3NsLndy aXRlKHN0cmluZyArICJcclxuIikKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAg c2VsZi5zb2NrZXQuc2VuZChzdHJpbmcgKyAiXHJcbiIpCiAgICAgICAgICAgICBpZiBERUJVRzoK LSAgICAgICAgICAgICAgICBwcmludCAiVE8gU0VSVkVSOiIsIHN0cmluZwotICAgICAgICBleGNl cHQgc29ja2V0LmVycm9yLCB4OgorICAgICAgICAgICAgICAgIHByaW50KCJUTyBTRVJWRVI6Iiwg c3RyaW5nKQorICAgICAgICBleGNlcHQgc29ja2V0LmVycm9yOgogICAgICAgICAgICAgIyBPdWNo IQogICAgICAgICAgICAgc2VsZi5kaXNjb25uZWN0KCJDb25uZWN0aW9uIHJlc2V0IGJ5IHBlZXIu IikKIApAQCAtODg4LDggKzg4NSw4IEBAIGNsYXNzIERDQ0Nvbm5lY3Rpb24oQ29ubmVjdGlvbik6 CiAgICAgICAgIHNlbGYucGFzc2l2ZSA9IDAKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgc2Vs Zi5zb2NrZXQuY29ubmVjdCgoc2VsZi5wZWVyYWRkcmVzcywgc2VsZi5wZWVycG9ydCkpCi0gICAg ICAgIGV4Y2VwdCBzb2NrZXQuZXJyb3IsIHg6Ci0gICAgICAgICAgICByYWlzZSBEQ0NDb25uZWN0 aW9uRXJyb3IsICJDb3VsZG4ndCBjb25uZWN0IHRvIHNvY2tldDogJXMiICUgeAorICAgICAgICBl eGNlcHQgc29ja2V0LmVycm9yIGFzIHg6CisgICAgICAgICAgICByYWlzZSBEQ0NDb25uZWN0aW9u RXJyb3IoIkNvdWxkbid0IGNvbm5lY3QgdG8gc29ja2V0OiAlcyIgJSB4KQogICAgICAgICBzZWxm LmNvbm5lY3RlZCA9IDEKICAgICAgICAgaWYgc2VsZi5pcmNsaWJvYmouZm5fdG9fYWRkX3NvY2tl dDoKICAgICAgICAgICAgIHNlbGYuaXJjbGlib2JqLmZuX3RvX2FkZF9zb2NrZXQoc2VsZi5zb2Nr ZXQpCkBAIC05MTMsOCArOTEwLDggQEAgY2xhc3MgRENDQ29ubmVjdGlvbihDb25uZWN0aW9uKToK ICAgICAgICAgICAgIHNlbGYuc29ja2V0LmJpbmQoKHNvY2tldC5nZXRob3N0YnluYW1lKHNvY2tl dC5nZXRob3N0bmFtZSgpKSwgMCkpCiAgICAgICAgICAgICBzZWxmLmxvY2FsYWRkcmVzcywgc2Vs Zi5sb2NhbHBvcnQgPSBzZWxmLnNvY2tldC5nZXRzb2NrbmFtZSgpCiAgICAgICAgICAgICBzZWxm LnNvY2tldC5saXN0ZW4oMTApCi0gICAgICAgIGV4Y2VwdCBzb2NrZXQuZXJyb3IsIHg6Ci0gICAg ICAgICAgICByYWlzZSBEQ0NDb25uZWN0aW9uRXJyb3IsICJDb3VsZG4ndCBiaW5kIHNvY2tldDog JXMiICUgeAorICAgICAgICBleGNlcHQgc29ja2V0LmVycm9yIGFzIHg6CisgICAgICAgICAgICBy YWlzZSBEQ0NDb25uZWN0aW9uRXJyb3IoIkNvdWxkbid0IGJpbmQgc29ja2V0OiAlcyIgJSB4KQog ICAgICAgICByZXR1cm4gc2VsZgogCiAgICAgZGVmIGRpc2Nvbm5lY3Qoc2VsZiwgbWVzc2FnZT0i Iik6CkBAIC05MzAsNyArOTI3LDcgQEAgY2xhc3MgRENDQ29ubmVjdGlvbihDb25uZWN0aW9uKToK ICAgICAgICAgc2VsZi5jb25uZWN0ZWQgPSAwCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHNl bGYuc29ja2V0LmNsb3NlKCkKLSAgICAgICAgZXhjZXB0IHNvY2tldC5lcnJvciwgeDoKKyAgICAg ICAgZXhjZXB0IHNvY2tldC5lcnJvcjoKICAgICAgICAgICAgIHBhc3MKICAgICAgICAgc2VsZi5z b2NrZXQgPSBOb25lCiAgICAgICAgIHNlbGYuaXJjbGlib2JqLl9oYW5kbGVfZXZlbnQoCkBAIC05 NDcsOCArOTQ0LDcgQEAgY2xhc3MgRENDQ29ubmVjdGlvbihDb25uZWN0aW9uKToKICAgICAgICAg ICAgIHNlbGYuc29ja2V0ID0gY29ubgogICAgICAgICAgICAgc2VsZi5jb25uZWN0ZWQgPSAxCiAg ICAgICAgICAgICBpZiBERUJVRzoKLSAgICAgICAgICAgICAgICBwcmludCAiRENDIGNvbm5lY3Rp b24gZnJvbSAlczolZCIgJSAoCi0gICAgICAgICAgICAgICAgICAgIHNlbGYucGVlcmFkZHJlc3Ms IHNlbGYucGVlcnBvcnQpCisgICAgICAgICAgICAgICAgcHJpbnQoIkRDQyBjb25uZWN0aW9uIGZy b20gJXM6JWQiICUgKHNlbGYucGVlcmFkZHJlc3MsIHNlbGYucGVlcnBvcnQpKQogICAgICAgICAg ICAgc2VsZi5pcmNsaWJvYmouX2hhbmRsZV9ldmVudCgKICAgICAgICAgICAgICAgICBzZWxmLAog ICAgICAgICAgICAgICAgIEV2ZW50KCJkY2NfY29ubmVjdCIsIHNlbGYucGVlcmFkZHJlc3MsIE5v bmUsIE5vbmUpKQpAQCAtOTU2LDcgKzk1Miw3IEBAIGNsYXNzIERDQ0Nvbm5lY3Rpb24oQ29ubmVj dGlvbik6CiAKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgbmV3X2RhdGEgPSBzZWxmLnNvY2tl dC5yZWN2KDIqKjE0KQotICAgICAgICBleGNlcHQgc29ja2V0LmVycm9yLCB4OgorICAgICAgICBl eGNlcHQgc29ja2V0LmVycm9yOgogICAgICAgICAgICAgIyBUaGUgc2VydmVyIGh1bmcgdXAuCiAg ICAgICAgICAgICBzZWxmLmRpc2Nvbm5lY3QoIkNvbm5lY3Rpb24gcmVzZXQgYnkgcGVlciIpCiAg ICAgICAgICAgICByZXR1cm4KQEAgLTk4NSwxMSArOTgxLDEwIEBAIGNsYXNzIERDQ0Nvbm5lY3Rp b24oQ29ubmVjdGlvbik6CiAgICAgICAgIHRhcmdldCA9IE5vbmUKICAgICAgICAgZm9yIGNodW5r IGluIGNodW5rczoKICAgICAgICAgICAgIGlmIERFQlVHOgotICAgICAgICAgICAgICAgIHByaW50 ICJGUk9NIFBFRVI6IiwgY2h1bmsKKyAgICAgICAgICAgICAgICBwcmludCgiRlJPTSBQRUVSOiIs IGNodW5rXykKICAgICAgICAgICAgIGFyZ3VtZW50cyA9IFtjaHVua10KICAgICAgICAgICAgIGlm IERFQlVHOgotICAgICAgICAgICAgICAgIHByaW50ICJjb21tYW5kOiAlcywgc291cmNlOiAlcywg dGFyZ2V0OiAlcywgYXJndW1lbnRzOiAlcyIgJSAoCi0gICAgICAgICAgICAgICAgICAgIGNvbW1h bmQsIHByZWZpeCwgdGFyZ2V0LCBhcmd1bWVudHMpCisgICAgICAgICAgICAgICAgcHJpbnQoImNv bW1hbmQ6ICVzLCBzb3VyY2U6ICVzLCB0YXJnZXQ6ICVzLCBhcmd1bWVudHM6ICVzIiAlIChjb21t YW5kLCBwcmVmaXgsIHRhcmdldCwgYXJndW1lbnRzKSkKICAgICAgICAgICAgIHNlbGYuaXJjbGli b2JqLl9oYW5kbGVfZXZlbnQoCiAgICAgICAgICAgICAgICAgc2VsZiwKICAgICAgICAgICAgICAg ICBFdmVudChjb21tYW5kLCBwcmVmaXgsIHRhcmdldCwgYXJndW1lbnRzKSkKQEAgLTEwMDksOCAr MTAwNCw4IEBAIGNsYXNzIERDQ0Nvbm5lY3Rpb24oQ29ubmVjdGlvbik6CiAgICAgICAgICAgICBp ZiBzZWxmLmRjY3R5cGUgPT0gImNoYXQiOgogICAgICAgICAgICAgICAgIHNlbGYuc29ja2V0LnNl bmQoIlxuIikKICAgICAgICAgICAgIGlmIERFQlVHOgotICAgICAgICAgICAgICAgIHByaW50ICJU TyBQRUVSOiAlc1xuIiAlIHN0cmluZwotICAgICAgICBleGNlcHQgc29ja2V0LmVycm9yLCB4Ogor ICAgICAgICAgICAgICAgIHByaW50KCJUTyBQRUVSOiAlc1xuIiAlIHN0cmluZykKKyAgICAgICAg ZXhjZXB0IHNvY2tldC5lcnJvcjoKICAgICAgICAgICAgICMgT3VjaCEKICAgICAgICAgICAgIHNl bGYuZGlzY29ubmVjdCgiQ29ubmVjdGlvbiByZXNldCBieSBwZWVyLiIpCiAKQEAgLTExODMsOCAr MTE3OCwxMyBAQCBkZWYgbWFza19tYXRjaGVzKG5pY2ssIG1hc2spOgogCiBfc3BlY2lhbCA9ICIt W11cXGBee30iCiBuaWNrX2NoYXJhY3RlcnMgPSBzdHJpbmcuYXNjaWlfbGV0dGVycyArIHN0cmlu Zy5kaWdpdHMgKyBfc3BlY2lhbAotX2lyY3N0cmluZ190cmFuc2xhdGlvbiA9IHN0cmluZy5tYWtl dHJhbnMoc3RyaW5nLmFzY2lpX3VwcGVyY2FzZSArICJbXVxcXiIsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJpbmcuYXNjaWlfbG93ZXJjYXNlICsgInt9fH4i KQorCitpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgorICAgIF9pcmNzdHJpbmdfdHJhbnNs YXRpb24gPSBzdHIubWFrZXRyYW5zKHN0cmluZy5hc2NpaV91cHBlcmNhc2UgKyAiW11cXF4iLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZy5hc2Np aV9sb3dlcmNhc2UgKyAie318fiIpCitlbHNlOgorICAgIF9pcmNzdHJpbmdfdHJhbnNsYXRpb24g PSBzdHJpbmcubWFrZXRyYW5zKHN0cmluZy5hc2NpaV91cHBlcmNhc2UgKyAiW11cXF4iLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZy5hc2NpaV9s b3dlcmNhc2UgKyAie318fiIpCiAKIGRlZiBpcmNfbG93ZXIocyk6CiAgICAgIiIiUmV0dXJucyBh IGxvd2VyY2FzZWQgc3RyaW5nLgpAQCAtMTU1Nyw0ICsxNTU3LDQgQEAgcHJvdG9jb2xfZXZlbnRz ID0gWwogICAgICJwb25nIiwKIF0KIAotYWxsX2V2ZW50cyA9IGdlbmVyYXRlZF9ldmVudHMgKyBw cm90b2NvbF9ldmVudHMgKyBudW1lcmljX2V2ZW50cy52YWx1ZXMoKQorYWxsX2V2ZW50cyA9IGdl bmVyYXRlZF9ldmVudHMgKyBwcm90b2NvbF9ldmVudHMgKyBsaXN0KG51bWVyaWNfZXZlbnRzLnZh bHVlcygpKQo=