101106 2012-11-02 14:53:28 -0700 lint-webkitpy doesn't autoinstall pylint properly 2012-11-05 11:48:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101161 1 dpranke dpranke abarth eric ojan ossy webkit.review.bot oldest_to_newest 757625 0 dpranke 2012-11-02 14:53:28 -0700 lint-webkitpy doesn't autoinstall pylint properly 757627 1 172147 dpranke 2012-11-02 14:54:46 -0700 Created attachment 172147 Patch 757805 2 dpranke 2012-11-02 17:50:21 -0700 Committed r133381: <http://trac.webkit.org/changeset/133381> 758062 3 webkit.review.bot 2012-11-04 00:59:01 -0700 Re-opened since this is blocked by bug 101161 758067 4 ossy 2012-11-04 01:05:12 -0800 (In reply to comment #2) > Committed r133381: <http://trac.webkit.org/changeset/133381> Rolled out by r133414, because it broke autoinstaller and webkit-patch indirectly: $ Tools/Scripts/webkit-patch --help Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 44, in <module> from webkitpy.tool.main import WebKitPatch File "/home/oszi/WebKit/Tools/Scripts/webkitpy/tool/main.py", line 38, in <module> from webkitpy.common.net.irc import ircproxy File "/home/oszi/WebKit/Tools/Scripts/webkitpy/common/net/irc/ircproxy.py", line 31, in <module> from webkitpy.common.net.irc.ircbot import IRCBot File "/home/oszi/WebKit/Tools/Scripts/webkitpy/common/net/irc/ircbot.py", line 32, in <module> from webkitpy.thirdparty.autoinstalled.irc import ircbot File "/home/oszi/WebKit/Tools/Scripts/webkitpy/thirdparty/__init__.py", line 91, in find_module self._install_irc() File "/home/oszi/WebKit/Tools/Scripts/webkitpy/thirdparty/__init__.py", line 150, in _install_irc url_subpath="irclib.py") File "/home/oszi/WebKit/Tools/Scripts/webkitpy/common/system/autoinstall.py", line 406, in install raise Exception(message) Exception: Error auto-installing the irclib.py package to: "/home/oszi/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/irc/irclib.py" --> Inner message: 'AutoInstaller' object has no attribute '_make_package' 758068 5 172147 ossy 2012-11-04 01:05:37 -0800 Comment on attachment 172147 Patch remove r+ from landed and rolled out patch. 758718 6 dpranke 2012-11-05 11:13:07 -0800 Thanks, Ossy! Sorry for the trouble. Re-landed w/ fix in http://trac.webkit.org/changeset/133504 . 172147 2012-11-02 14:54:46 -0700 2012-11-04 01:05:37 -0800 Patch bug-101106-20121102145306.patch text/plain 10625 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2Y4YTA4NDVhYmJkOGY1YzMzN2VkNGVhODE0MGFhODU3 YTc5ZGM4My4uYWRjNTliMmFjNGVmZTk2YTFjY2Y5M2IxMTZjNDk1ZWM3NzRjODk3MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDEyLTExLTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIGxpbnQtd2Via2l0cHkgZG9lc24ndCBhdXRvaW5zdGFsbCBweWxpbnQgcHJvcGVybHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTEwNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR1cm5zIG91 dCB0aGUgYXV0b2luc3RhbGxpbmcgY29kZSBmb3IgcHlsaW50IGRpZG4ndCBpbnN0YWxsCisgICAg ICAgIHB5bGludCdzIGRlcGVuZGVuY2llcywgYW5kIHRoZSBhdXRvaW5zdGFsbGVyIGNvZGUgZGlk bid0IHdvcmsKKyAgICAgICAgdXNpbmcgbmVzdGVkIGRpcmVjdG9yaWVzIChlLmcuLCAibG9naWxh Yi9hc3RuZyIpLiBGaXggdGhvc2UgaXNzdWVzLAorICAgICAgICBjbGVhbiB1cCB0aGUgYXV0b2lu c3RhbGxlciBjb2RlLCBhbmQgYWRkIHRlc3RzIHRvIG1ha2Ugc3VyZSBldmVyeXRoaW5nCisgICAg ICAgIGltcG9ydHMgc3VjY2Vzc2Z1bGx5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL2F1dG9pbnN0YWxsLnB5OgorICAgICAgICAoQXV0b0luc3RhbGxlci5fY3Jl YXRlX3NjcmF0Y2hfZGlyZWN0b3J5KToKKyAgICAgICAgKEF1dG9JbnN0YWxsZXIuX2luc3RhbGwp OgorICAgICAgICAoQXV0b0luc3RhbGxlci5pbnN0YWxsKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9y dEhvb2suX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCk6CisgICAgICAg IChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcHlsaW50KToKKyAgICAgICAgKEF1dG9p bnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9jb3ZlcmFnZSk6CisgICAgICAgIChBdXRvaW5zdGFs bEltcG9ydEhvb2suX2luc3RhbGxfZWxpemEpOgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRI b29rLl9pbnN0YWxsKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19p bml0X19fdW5pdHRlc3QucHk6CisgICAgICAgIChUaGlyZHBhcnR5VGVzdC50ZXN0X2ltcG9ydF9o b29rLk1vY2tJbXBvcnRIb29rLl9faW5pdF9fKToKKyAgICAgICAgKFRoaXJkcGFydHlUZXN0LnRl c3RfaW1wb3J0X2hvb2spOgorICAgICAgICAoVGhpcmRwYXJ0eVRlc3QudGVzdF9pbXBvcnRzKToK KworMjAxMi0xMS0wMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAg ICAgICB3ZWJraXRweTogY2xlYW4gdXAgbG9nZ2luZyBpbiBjb21tb24uc3lzdGVtLmF1dG9pbnN0 YWxsCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEw OTAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2F1 dG9pbnN0YWxsLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2F1dG9p bnN0YWxsLnB5CmluZGV4IDc2N2E4YTUxZDYyMTUwNzM5YzhlMDcxYzM3ODgzMzZkMmMyNDgxN2Iu LmY3ZTRmNWU1YTQyYjU1ZGUzNjRmMWI0NGNjNDBkZmRlZDcxZTFhNTcgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9hdXRvaW5zdGFsbC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vYXV0b2luc3RhbGwucHkKQEAgLTE1 NCw3ICsxNTQsNyBAQCBjbGFzcyBBdXRvSW5zdGFsbGVyKG9iamVjdCk6CiAgICAgICAgIHRlbXAg ZGlyZWN0b3J5IGlmIGl0IGRvZXMgbm90IGFscmVhZHkgZXhpc3QuCiAKICAgICAgICAgIiIiCi0g ICAgICAgIHByZWZpeCA9IHRhcmdldF9uYW1lICsgIl8iCisgICAgICAgIHByZWZpeCA9IHRhcmdl dF9uYW1lLnJlcGxhY2Uob3Muc2VwLCAiXyIpICsgIl8iCiAgICAgICAgIHRyeToKICAgICAgICAg ICAgIHNjcmF0Y2hfZGlyID0gc2VsZi5fY3JlYXRlX3NjcmF0Y2hfZGlyZWN0b3J5X2lubmVyKHBy ZWZpeCkKICAgICAgICAgZXhjZXB0IE9TRXJyb3I6CkBAIC0zMzgsMTEgKzMzOCwxNiBAQCBjbGFz cyBBdXRvSW5zdGFsbGVyKG9iamVjdCk6CiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAg ICAgIG9zLnJlbW92ZSh0YXJnZXRfcGF0aCkKIAotICAgICAgICAjIFRoZSBzaHV0aWwubW92ZSgp IGNvbW1hbmQgY3JlYXRlcyBpbnRlcm1lZGlhdGUgZGlyZWN0b3JpZXMgaWYgdGhleQotICAgICAg ICAjIGRvIG5vdCBleGlzdCwgYnV0IHdlIGRvIG5vdCByZWx5IG9uIHRoaXMgYmVoYXZpb3Igc2lu Y2Ugd2UKLSAgICAgICAgIyBuZWVkIHRvIGNyZWF0ZSB0aGUgX19pbml0X18ucHkgZmlsZSBhbnl3 YXkuCisgICAgICAgICMgc2h1dGlsLm1vdmUoKSBjb21tYW5kIGNyZWF0ZXMgaW50ZXJtZWRpYXRl IGRpcmVjdG9yaWVzIGlmIHRoZXkgZG8gbm90IGV4aXN0LgogICAgICAgICBzaHV0aWwubW92ZShz b3VyY2VfcGF0aCwgdGFyZ2V0X3BhdGgpCiAKKyAgICAgICAgIyBlbnN1cmUgYWxsIHRoZSBuZXcg ZGlyZWN0b3JpZXMgYXJlIGltcG9ydGFibGUuCisgICAgICAgIGludGVybWVkaWF0ZV9kaXJzID0g b3MucGF0aC5kaXJuYW1lKG9zLnBhdGgucmVscGF0aCh0YXJnZXRfcGF0aCwgc2VsZi5fdGFyZ2V0 X2RpcikpCisgICAgICAgIHBhcmVudF9kaXJuYW1lID0gc2VsZi5fdGFyZ2V0X2RpcgorICAgICAg ICBmb3IgZGlybmFtZSBpbiBpbnRlcm1lZGlhdGVfZGlycy5zcGxpdChvcy5zZXApOgorICAgICAg ICAgICAgcGFyZW50X2Rpcm5hbWUgPSBvcy5wYXRoLmpvaW4ocGFyZW50X2Rpcm5hbWUsIGRpcm5h bWUpCisgICAgICAgICAgICBzZWxmLl9tYWtlX3BhY2thZ2UocGFyZW50X2Rpcm5hbWUpCisKICAg ICAgICAgc2VsZi5fcmVjb3JkX3VybF9kb3dubG9hZGVkKHBhY2thZ2VfbmFtZSwgdXJsKQogCiAg ICAgZGVmIGluc3RhbGwoc2VsZiwgdXJsLCBzaG91bGRfcmVmcmVzaD1GYWxzZSwgdGFyZ2V0X25h bWU9Tm9uZSwKQEAgLTM3OCw3ICszODMsOCBAQCBjbGFzcyBBdXRvSW5zdGFsbGVyKG9iamVjdCk6 CiAgICAgICAgIGlmIG5vdCBzaG91bGRfcmVmcmVzaCBhbmQgc2VsZi5faXNfZG93bmxvYWRlZCh0 YXJnZXRfbmFtZSwgdXJsKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCi0gICAgICAgIF9s b2cuaW5mbygiQXV0by1pbnN0YWxsaW5nIHBhY2thZ2U6ICVzIiAlIHRhcmdldF9uYW1lKQorICAg ICAgICBwYWNrYWdlX25hbWUgPSB0YXJnZXRfbmFtZS5yZXBsYWNlKG9zLnNlcCwgJy4nKQorICAg ICAgICBfbG9nLmluZm8oIkF1dG8taW5zdGFsbGluZyBwYWNrYWdlOiAlcyIgJSBwYWNrYWdlX25h bWUpCiAKICAgICAgICAgIyBUaGUgc2NyYXRjaCBkaXJlY3RvcnkgaXMgd2hlcmUgd2Ugd2lsbCBk b3dubG9hZCBhbmQgcHJlcGFyZQogICAgICAgICAjIGZpbGVzIHNwZWNpZmljIHRvIHRoaXMgaW5z dGFsbCB1bnRpbCB0aGV5IGFyZSByZWFkeSB0byBtb3ZlCkBAIC0zODYsNyArMzkyLDcgQEAgY2xh c3MgQXV0b0luc3RhbGxlcihvYmplY3QpOgogICAgICAgICBzY3JhdGNoX2RpciA9IHNlbGYuX2Ny ZWF0ZV9zY3JhdGNoX2RpcmVjdG9yeSh0YXJnZXRfbmFtZSkKIAogICAgICAgICB0cnk6Ci0gICAg ICAgICAgICBzZWxmLl9pbnN0YWxsKHBhY2thZ2VfbmFtZT10YXJnZXRfbmFtZSwKKyAgICAgICAg ICAgIHNlbGYuX2luc3RhbGwocGFja2FnZV9uYW1lPXBhY2thZ2VfbmFtZSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGFyZ2V0X3BhdGg9dGFyZ2V0X3BhdGgsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNjcmF0Y2hfZGlyPXNjcmF0Y2hfZGlyLAogICAgICAgICAgICAgICAgICAgICAg ICAgICB1cmw9dXJsLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBh cnR5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5p dF9fLnB5CmluZGV4IDQ2M2E4NjQwZTkwMTkzODY5YWVjNjM1M2U0NmYyNWU2MDVmMjJiZWIuLmFh YzA3MDYwOWU4NmFmMzU4NDJjZTRlODBkNDhkZWNhZTRhYjJkYjQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKQEAgLTY1LDYgKzY1LDExIEBAIGNs YXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxm LCBmaWxlc3lzdGVtPU5vbmUpOgogICAgICAgICBzZWxmLl9mcyA9IGZpbGVzeXN0ZW0gb3IgRmls ZVN5c3RlbSgpCiAKKyAgICBkZWYgX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNf cGF0aChzZWxmKToKKyAgICAgICAgIyBTb21lIHBhY2thZ2VzIHJlcXVpcmUgdGhhdCB0aGUgYXJl IGJlaW5nIHB1dCBzb21ld2hlcmUgdW5kZXIgYSBkaXJlY3RvcnkgaW4gc3lzLnBhdGguCisgICAg ICAgIGlmIG5vdCBfQVVUT0lOU1RBTExFRF9ESVIgaW4gc3lzLnBhdGg6CisgICAgICAgICAgICBz eXMucGF0aC5hcHBlbmQoX0FVVE9JTlNUQUxMRURfRElSKQorCiAgICAgZGVmIGZpbmRfbW9kdWxl KHNlbGYsIGZ1bGxuYW1lLCBwYXRoKToKICAgICAgICAgIyBUaGlzIG1ldGhvZCB3aWxsIHJ1biBi ZWZvcmUgZWFjaCBpbXBvcnQuIFNlZSBodHRwOi8vd3d3LnB5dGhvbi5vcmcvZGV2L3BlcHMvcGVw LTAzMDIvCiAgICAgICAgIGlmICcuYXV0b2luc3RhbGxlZCcgbm90IGluIGZ1bGxuYW1lOgpAQCAt OTgsMTAgKzEwMywxMyBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgInBlcDgtMC41LjAvcGVwOC5weSIpCiAKICAgICBk ZWYgX2luc3RhbGxfcHlsaW50KHNlbGYpOgorICAgICAgICBzZWxmLl9lbnN1cmVfYXV0b2luc3Rh bGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQogICAgICAgICBkaWRfaW5zdGFsbF9zb21ldGhpbmcg PSBGYWxzZQogICAgICAgICBpZiBub3Qgc2VsZi5fZnMuZXhpc3RzKHNlbGYuX2ZzLmpvaW4oX0FV VE9JTlNUQUxMRURfRElSLCAicHlsaW50IikpOgotICAgICAgICAgICAgZGlkX2luc3RhbGxfc29t ZXRoaW5nID0gc2VsZi5faW5zdGFsbCgnaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9z b3VyY2UvcC9weWxpbnQvcHlsaW50LTAuMjUuMS50YXIuZ3ojbWQ1PTcyOGJiYzJiMzM5YmMzNzQ5 YWYwMTM3MDlhN2Y4N2E1JywgJ3B5bGludC0wLjI1LjEnKQotICAgICAgICAgICAgc2VsZi5fZnMu bW92ZShzZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgInB5bGludC0wLjI1LjEiKSwg c2VsZi5fZnMuam9pbihfQVVUT0lOU1RBTExFRF9ESVIsICJweWxpbnQiKSkKKyAgICAgICAgICAg IGluc3RhbGxlciA9IEF1dG9JbnN0YWxsZXIodGFyZ2V0X2Rpcj1fQVVUT0lOU1RBTExFRF9ESVIp CisgICAgICAgICAgICBkaWRfaW5zdGFsbF9zb21ldGhpbmcgPSBpbnN0YWxsZXIuaW5zdGFsbCgi aHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvbC9sb2dpbGFiLWNvbW1vbi9s b2dpbGFiLWNvbW1vbi0wLjU4LjEudGFyLmd6I21kNT03NzI5OGFiMmQ4YmI4YjRhZjkyMTk3OTFl N2NlZThjZSIsIHVybF9zdWJwYXRoPSJsb2dpbGFiLWNvbW1vbi0wLjU4LjEiLCB0YXJnZXRfbmFt ZT0ibG9naWxhYi9jb21tb24iKQorICAgICAgICAgICAgZGlkX2luc3RhbGxfc29tZXRoaW5nIHw9 IGluc3RhbGxlci5pbnN0YWxsKCJodHRwOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3NvdXJj ZS9sL2xvZ2lsYWItYXN0bmcvbG9naWxhYi1hc3RuZy0wLjI0LjEudGFyLmd6I21kNT1kZGFmNjZl NGQ4NTcxNGQ5YzQ3YTQ2ZDRiZWQ0MDZkZSIsIHVybF9zdWJwYXRoPSJsb2dpbGFiLWFzdG5nLTAu MjQuMSIsIHRhcmdldF9uYW1lPSJsb2dpbGFiL2FzdG5nIikKKyAgICAgICAgICAgIGRpZF9pbnN0 YWxsX3NvbWV0aGluZyB8PSBpbnN0YWxsZXIuaW5zdGFsbCgnaHR0cDovL3B5cGkucHl0aG9uLm9y Zy9wYWNrYWdlcy9zb3VyY2UvcC9weWxpbnQvcHlsaW50LTAuMjUuMS50YXIuZ3ojbWQ1PTcyOGJi YzJiMzM5YmMzNzQ5YWYwMTM3MDlhN2Y4N2E1JywgdXJsX3N1YnBhdGg9InB5bGludC0wLjI1LjEi LCB0YXJnZXRfbmFtZT0icHlsaW50IikKICAgICAgICAgcmV0dXJuIGRpZF9pbnN0YWxsX3NvbWV0 aGluZwogCiAgICAgIyBhdXRvaW5zdGFsbGVkLmJ1aWxkYm90IGlzIHVzZWQgYnkgQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyY2ZnX3VuaXR0ZXN0LnB5CkBA IC0xMjYsMTggKzEzNCwxMSBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToK ICAgICAgICAgcmV0dXJuIGRpZF9pbnN0YWxsX3NvbWV0aGluZwogCiAgICAgZGVmIF9pbnN0YWxs X2NvdmVyYWdlKHNlbGYpOgotICAgICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdl dF9kaXI9X0FVVE9JTlNUQUxMRURfRElSKQotICAgICAgICBkaWRfaW5zdGFsbF9zb21ldGhpbmcg PSBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHA6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMv c291cmNlL2MvY292ZXJhZ2UvY292ZXJhZ2UtMy41LjEudGFyLmd6I21kNT00MTBkNGM4MTU1YTRk YWIyMjJmMmJjNTEyMTJkNGEyNCIsIHVybF9zdWJwYXRoPSJjb3ZlcmFnZS0zLjUuMS9jb3ZlcmFn ZSIpCi0KLSAgICAgICAgIyBOb3RlIHRoYXQgY292ZXJhZ2UgbmVlZHMgdG8gYmUgdW5kZXIgYSBk aXJlY3RvcnkgYWxyZWFkeSBpbiBzeXMucGF0aCBmb3IgaXRzCi0gICAgICAgICMgaW50ZXJuYWwg aW1wb3J0cyB0byB3b3JrIGNvcnJlY3RseSA6KC4KLSAgICAgICAgaWYgbm90IF9BVVRPSU5TVEFM TEVEX0RJUiBpbiBzeXMucGF0aDoKLSAgICAgICAgICAgIHN5cy5wYXRoLmFwcGVuZChfQVVUT0lO U1RBTExFRF9ESVIpCi0gICAgICAgIHJldHVybiBkaWRfaW5zdGFsbF9zb21ldGhpbmcKKyAgICAg ICAgc2VsZi5fZW5zdXJlX2F1dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKCkKKyAgICAg ICAgcmV0dXJuIHNlbGYuX2luc3RhbGwodXJsPSJodHRwOi8vcHlwaS5weXRob24ub3JnL3BhY2th Z2VzL3NvdXJjZS9jL2NvdmVyYWdlL2NvdmVyYWdlLTMuNS4xLnRhci5neiNtZDU9NDEwZDRjODE1 NWE0ZGFiMjIyZjJiYzUxMjEyZDRhMjQiLCB1cmxfc3VicGF0aD0iY292ZXJhZ2UtMy41LjEvY292 ZXJhZ2UiKQogCiAgICAgZGVmIF9pbnN0YWxsX2VsaXphKHNlbGYpOgotICAgICAgICBpbnN0YWxs ZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9X0FVVE9JTlNUQUxMRURfRElSKQotICAgICAg ICByZXR1cm4gaW5zdGFsbGVyLmluc3RhbGwodXJsPSJodHRwOi8vd3d3LmFkYW1iYXJ0aC5jb20v d2Via2l0L2VsaXphIiwgdGFyZ2V0X25hbWU9ImVsaXphLnB5IikKKyAgICAgICAgcmV0dXJuIHNl bGYuX2luc3RhbGwodXJsPSJodHRwOi8vd3d3LmFkYW1iYXJ0aC5jb20vd2Via2l0L2VsaXphIiwg dGFyZ2V0X25hbWU9ImVsaXphLnB5IikKIAogICAgIGRlZiBfaW5zdGFsbF9pcmMoc2VsZik6CiAg ICAgICAgICMgU2luY2UgaXJjbGliIGFuZCBpcmNib3QgYXJlIHR3byB0b3AtbGV2ZWwgcGFja2Fn ZXMsIHdlIG5lZWQgdG8gaW1wb3J0CkBAIC0xNjIsOSArMTYzLDkgQEAgY2xhc3MgQXV0b2luc3Rh bGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9mcy53cml0ZV90ZXh0X2Zp bGUoaW5pdF9wYXRoLCAiIikKICAgICAgICAgcmV0dXJuIGRpZF9pbnN0YWxsX3NvbWV0aGluZwog Ci0gICAgZGVmIF9pbnN0YWxsKHNlbGYsIHVybCwgdXJsX3N1YnBhdGgpOgorICAgIGRlZiBfaW5z dGFsbChzZWxmLCB1cmwsIHVybF9zdWJwYXRoPU5vbmUsIHRhcmdldF9uYW1lPU5vbmUpOgogICAg ICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9X0FVVE9JTlNUQUxMRURf RElSKQotICAgICAgICByZXR1cm4gaW5zdGFsbGVyLmluc3RhbGwodXJsPXVybCwgdXJsX3N1YnBh dGg9dXJsX3N1YnBhdGgpCisgICAgICAgIHJldHVybiBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9dXJs LCB1cmxfc3VicGF0aD11cmxfc3VicGF0aCwgdGFyZ2V0X25hbWU9dGFyZ2V0X25hbWUpCiAKIAog X2hvb2sgPSBBdXRvaW5zdGFsbEltcG9ydEhvb2soKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5CmluZGV4IDM1ODNhYjQz MmE3MWI2ZjVlMTA5MGRhN2Y0NTdmYmQzOTYzNzU4M2UuLjgyM2Y4ZjEyMTIyNTMzMWU1NGUxMTNm M2EzYjNjMjAyMDdjZWQzYTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhp cmRwYXJ0eS9fX2luaXRfX191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkKQEAgLTMyLDEzICszMiwxNCBAQCBpbXBv cnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5IGltcG9ydCBBdXRvaW5zdGFs bEltcG9ydEhvb2sKIAorCiBjbGFzcyBUaGlyZHBhcnR5VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgZGVmIHRlc3RfaW1wb3J0X2hvb2soc2VsZik6CiAgICAgICAgICMgQWRkIGFub3RoZXIg aW1wb3J0IGhvb2sgYW5kIG1ha2Ugc3VyZSB3ZSBnZXQgY2FsbGVkLgogICAgICAgICBjbGFzcyBN b2NrSW1wb3J0SG9vayhBdXRvaW5zdGFsbEltcG9ydEhvb2spOgogICAgICAgICAgICAgZGVmIF9f aW5pdF9fKHNlbGYpOgogICAgICAgICAgICAgICAgIEF1dG9pbnN0YWxsSW1wb3J0SG9vay5fX2lu aXRfXyhzZWxmKQotICAgICAgICAgICAgICAgIHNlbGYuX2VsaXphX2luc3RhbGxlZCA9IEZhbHNl CisgICAgICAgICAgICAgICAgc2VsZi5lbGl6YV9pbnN0YWxsZWQgPSBGYWxzZQogCiAgICAgICAg ICAgICBkZWYgX2luc3RhbGxfZWxpemEoc2VsZik6CiAgICAgICAgICAgICAgICAgc2VsZi5lbGl6 YV9pbnN0YWxsZWQgPSBUcnVlCkBAIC00OCwxMSArNDksMjQgQEAgY2xhc3MgVGhpcmRwYXJ0eVRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgIyBUaGUgYWN0dWFsIEF1dG9pbnN0 YWxsSW1wb3J0SG9vayBzaG91bGQgYmUgaW5zdGFsbGVkIGJlZm9yZSB1cywKICAgICAgICAgICAg ICMgc28gdGhlc2UgbW9kdWxlcyB3aWxsIGdldCBpbnN0YWxsZWQgYmVmb3JlIE1vY2tJbXBvcnRI b29rIHJ1bnMuCiAgICAgICAgICAgICBzeXMubWV0YV9wYXRoLmFwcGVuZChtb2NrX2ltcG9ydF9o b29rKQotICAgICAgICAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQg aW1wb3J0IGVsaXphCisgICAgICAgICAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2lu c3RhbGxlZCBpbXBvcnQgZWxpemEgICMgdW51c2VkIHZhcmlhYmxlIC0gcHlsaW50OiBkaXNhYmxl LW1zZz1XMDYxMgogICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG1vY2tfaW1wb3J0X2hvb2su ZWxpemFfaW5zdGFsbGVkKQogCiAgICAgICAgIGZpbmFsbHk6CiAgICAgICAgICAgICBzeXMubWV0 YV9wYXRoLnJlbW92ZShtb2NrX2ltcG9ydF9ob29rKQogCisgICAgZGVmIHRlc3RfaW1wb3J0cyhz ZWxmKToKKyAgICAgICAgIyBUaGlzIG1ldGhvZCB0ZXN0cyB0aGF0IHdlIGNhbiBhY3R1YWxseSBp bXBvcnQgZXZlcnl0aGluZy4KKyAgICAgICAgaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0 b2luc3RhbGxlZC5idWlsZGJvdCAgIyB1bnVzZWQgdmFyaWFibGUgLSBweWxpbnQ6IGRpc2FibGUt bXNnPVcwNjEyCisgICAgICAgIGltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxs ZWQuY292ZXJhZ2UKKyAgICAgICAgaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3Rh bGxlZC5lbGl6YQorICAgICAgICBpbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFs bGVkLmlyYy5pcmNib3QKKyAgICAgICAgaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2lu c3RhbGxlZC5pcmMuaXJjbGliCisgICAgICAgIGltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LmF1 dG9pbnN0YWxsZWQubWVjaGFuaXplCisgICAgICAgIGltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5 LmF1dG9pbnN0YWxsZWQucHlsaW50CisgICAgICAgIGltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5 LmF1dG9pbnN0YWxsZWQud2VicGFnZXJlcGxheQorICAgICAgICBpbXBvcnQgd2Via2l0cHkudGhp cmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnBlcDgKKworCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18n OgogICAgIHVuaXR0ZXN0Lm1haW4oKQo=