93301 2012-08-06 15:34:52 -0700 test-webkitpy hangs in a new checkout on snow leopard 2022-02-27 23:53:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ojan ossy rniwa webkit.review.bot oldest_to_newest 688473 0 dpranke 2012-08-06 15:34:52 -0700 test-webkitpy hangs in a new checkout on snow leopard 688474 1 156774 dpranke 2012-08-06 15:37:15 -0700 Created attachment 156774 Patch 688482 2 dpranke 2012-08-06 15:45:31 -0700 Note that running test-webkitpy a second time seems to pass. Also note that this is a conservative patch; I didn't want to try and figure out what was hanging or why, as that seemed like it might be a fragile solution, and also more time-consuming than was really warranted. 688491 3 156774 rniwa 2012-08-06 15:52:00 -0700 Comment on attachment 156774 Patch Confirmed that this fixes the problem at least on my Snow Leopard machine. 688494 4 156774 ojan 2012-08-06 15:54:06 -0700 Comment on attachment 156774 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156774&action=review > Tools/Scripts/webkitpy/test/main.py:133 > + if installed_something: Should we restrict this to python older than 2.6.5? 688496 5 dpranke 2012-08-06 15:57:06 -0700 (In reply to comment #4) > (From update of attachment 156774 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156774&action=review > > > Tools/Scripts/webkitpy/test/main.py:133 > > + if installed_something: > > Should we restrict this to python older than 2.6.5? We could; I don't feel strongly about it, and this will only have an impact if we are actually autoinstalling things, which should only happen rarely. 688497 6 dpranke 2012-08-06 15:57:30 -0700 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 156774 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=156774&action=review > > > > > Tools/Scripts/webkitpy/test/main.py:133 > > > + if installed_something: > > > > Should we restrict this to python older than 2.6.5? > > We could; I don't feel strongly about it, and this will only have an impact if we are actually autoinstalling things, which should only happen rarely. Would you like me to restrict it? 688545 7 ojan 2012-08-06 16:31:40 -0700 (In reply to comment #6) > (In reply to comment #5) > > (In reply to comment #4) > > > (From update of attachment 156774 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=156774&action=review > > > > > > > Tools/Scripts/webkitpy/test/main.py:133 > > > > + if installed_something: > > > > > > Should we restrict this to python older than 2.6.5? > > > > We could; I don't feel strongly about it, and this will only have an impact if we are actually autoinstalling things, which should only happen rarely. > > Would you like me to restrict it? It's up to you. I don't feel strongly. The main advantage of restricting IMO is that we can kill the code once we no longer support older pythons. Not a big deal in this case since it's a tiny amount of added complexity. 689502 8 dpranke 2012-08-07 15:38:20 -0700 I'm not sure that adding an explicit version check gets you something that the fixme doesn't already get you; someone's still gonna have to grep for '2.6' or '2.6.1' and then do something. I'll leave it as it is for now since getting a useful python version string is mildly annoying :). 689504 9 dpranke 2012-08-07 15:39:36 -0700 Committed r124928: <http://trac.webkit.org/changeset/124928> 156774 2012-08-06 15:37:15 -0700 2022-02-27 23:53:57 -0800 Patch bug-93301-20120806153651.patch text/plain 10793 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzQzMmUzZDE4MjM0ZTBlYWMzYjkyYTMyNGQ2ZjQ3NDdl MmRmNWNjMS4uMmVjMGY1YmI2YzgwNTIzMTQ2MWMxNjg4Zjc3ZmZjYzI5ZmRhMjg1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1 IEBACiAyMDEyLTA4LTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHkgaGFuZ3MgaW4gYSBuZXcgY2hlY2tvdXQgb24gc25vdyBsZW9w YXJkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzMw MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg Y2hhbmdlIHdvcmtzIGFyb3VuZCB3aGF0IGFwcGVhcnMgdG8gYmUgYSBidWcgaW4gUHl0aG9uCisg ICAgICAgIDIuNi4xICh0aGUgdmVyc2lvbiB0aGF0IHNoaXBzIG9uIE1hYyBTbm93IExlb3BhcmQp IHRoYXQgY2F1c2VzCisgICAgICAgIHRoZSBtdWx0aXByb2Nlc3NpbmcgbW9kdWxlIHRvIGhhbmcg YWZ0ZXIgd2UgdXNlIHRoZQorICAgICAgICBhdXRvaW5zdGFsbGVyOyBJJ20gZ3Vlc3NpbmcgaXQn cyBzb21lIHNvcnQgb2YgcHl0aG9uIHNvY2tldHMKKyAgICAgICAgaXNzdWUuIEkgd2FzIHVuYWJs ZSB0byByZXByb2R1Y2UgdGhpcyB3aXRoIDIuNi41IG9yIG5ld2VyCisgICAgICAgIHZlcnNpb25z IG9mIFB5dGhvbi4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9h dXRvaW5zdGFsbC5weToKKyAgICAgICAgKEF1dG9JbnN0YWxsZXIuaW5zdGFsbCk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHk6CisgICAgICAgIChUZXN0ZXIuX3J1bl90 ZXN0cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5 OgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX21lY2hhbml6ZSk6Cisg ICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcGVwOCk6CisgICAgICAgIChB dXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcHlsaW50KToKKyAgICAgICAgKEF1dG9pbnN0 YWxsSW1wb3J0SG9vay5faW5zdGFsbF9idWlsZGJvdCk6CisgICAgICAgIChBdXRvaW5zdGFsbElt cG9ydEhvb2suX2luc3RhbGxfY292ZXJhZ2UpOgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRI b29rLl9pbnN0YWxsX2VsaXphKToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5z dGFsbF9pcmMpOgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX3dlYnBh Z2VyZXBsYXkpOgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsKToKKyAg ICAgICAgKGF1dG9pbnN0YWxsX2V2ZXJ5dGhpbmcpOgorCisyMDEyLTA4LTA2ICBEaXJrIFByYW5r ZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIG5yd3Q6IGhhbmRsZSBlcnJvcnMg ZnJvbSBpbWFnZSBkaWZmIGJldHRlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTI5MzQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2F1dG9pbnN0YWxsLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL2F1dG9pbnN0YWxsLnB5CmluZGV4IGU1YmMwYjJjYmE3MThkNDUwZjZmY2E3 ZjAxMmNmNDdjNzNjYmI5M2IuLjAwYWZmODNmZmFiMmJhYWM5YjM3OTYzOTkwNThlM2RmOGQ0Njhl NWYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9hdXRv aW5zdGFsbC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vYXV0 b2luc3RhbGwucHkKQEAgLTQ1Niw3ICs0NTYsNyBAQCBjbGFzcyBBdXRvSW5zdGFsbGVyKG9iamVj dCk6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCdVUkwgZm9yICVzIGFscmVhZHkgZG93bmxvYWRl ZC4gIFNraXBwaW5nLi4uJwogICAgICAgICAgICAgICAgICAgICAgICAlIHRhcmdldF9uYW1lKQog ICAgICAgICAgICAgX2xvZy5kZWJ1ZygnICAgICIlcyInICUgdXJsKQotICAgICAgICAgICAgcmV0 dXJuCisgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgICAgICBzZWxmLl9sb2dfdHJhbnNm ZXIoIkF1dG8taW5zdGFsbGluZyBwYWNrYWdlOiAlcyIgJSB0YXJnZXRfbmFtZSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1cmwsIHRhcmdldF9wYXRoLCBsb2dfbWV0aG9kPV9sb2cuaW5m bykKQEAgLTQ4NCw2ICs0ODQsNyBAQCBjbGFzcyBBdXRvSW5zdGFsbGVyKG9iamVjdCk6CiAgICAg ICAgICAgICBzaHV0aWwucm10cmVlKHNjcmF0Y2hfZGlyKQogICAgICAgICBfbG9nLmRlYnVnKCdB dXRvLWluc3RhbGxlZCAlcyB0bzonICUgdGFyZ2V0X25hbWUpCiAgICAgICAgIF9sb2cuZGVidWco JyAgICAiJXMiJyAlIHRhcmdldF9wYXRoKQorICAgICAgICByZXR1cm4gVHJ1ZQogCiAKIGlmIF9f bmFtZV9fPT0iX19tYWluX18iOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 ZXN0L21haW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weQppbmRleCAy NDlmZGMwYzRjYzdkMDE1YzE3OTQwNDBhNDVmZTQ5OGFmMDA0NjYyLi4yOGRlOGE2ZTAzNWFiNGMx ZDVjMWU1YTE5YTQ5OGMxMDUyNzc4MDUwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rlc3QvbWFpbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5w eQpAQCAtMTI2LDcgKzEyNiwxMyBAQCBjbGFzcyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgIyBh bmQgbm90IGhhdmUgdG8gd29ycnkgYWJvdXQgYXV0b2luc3RhbGxpbmcgcGFja2FnZXMgY29uY3Vy cmVudGx5LgogICAgICAgICBzZWxmLnByaW50ZXIud3JpdGVfdXBkYXRlKCJDaGVja2luZyBhdXRv aW5zdGFsbGVkIHBhY2thZ2VzIC4uLiIpCiAgICAgICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0 eSBpbXBvcnQgYXV0b2luc3RhbGxfZXZlcnl0aGluZwotICAgICAgICBhdXRvaW5zdGFsbF9ldmVy eXRoaW5nKCkKKyAgICAgICAgaW5zdGFsbGVkX3NvbWV0aGluZyA9IGF1dG9pbnN0YWxsX2V2ZXJ5 dGhpbmcoKQorCisgICAgICAgICMgRklYTUU6IFRoZXJlIGFwcGVhcnMgdG8gYmUgYSBidWcgaW4g UHl0aG9uIDIuNi4xIHRoYXQgaXMgY2F1c2luZyBtdWx0aXByb2Nlc3NpbmcKKyAgICAgICAgIyB0 byBoYW5nIGFmdGVyIHdlIGluc3RhbGwgdGhlIHBhY2thZ2VzIGluIGEgY2xlYW4gY2hlY2tvdXQu CisgICAgICAgIGlmIGluc3RhbGxlZF9zb21ldGhpbmc6CisgICAgICAgICAgICBfbG9nLndhcm5p bmcoIldlIGluc3RhbGxlZCBuZXcgcGFja2FnZXMsIHNvIHJ1bm5pbmcgdGhpbmdzIHNlcmlhbGx5 IGF0IGZpcnN0IikKKyAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzID0g MQogCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuY292ZXJhZ2U6CiAgICAgICAgICAgICBpbXBv cnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLmNvdmVyYWdlIGFzIGNvdmVyYWdl CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18u cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKaW5kZXgg MzIxYTQ4MzMyZWIxZTBhYjdhMDk3NjBlMmQyNzUxYzRjMzExZTRhOC4uMTdhZTYyYTA3ZWI3NGMx YzdmZmY1ODkyMWZhYzBlYWVlZjkyOWRkYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dGhpcmRwYXJ0eS9fX2luaXRfXy5weQpAQCAtOTAsMTggKzkwLDE5IEBAIGNsYXNzIEF1dG9pbnN0 YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF93ZWJwYWdl cmVwbGF5KCkKIAogICAgIGRlZiBfaW5zdGFsbF9tZWNoYW5pemUoc2VsZik6Ci0gICAgICAgIHNl bGYuX2luc3RhbGwoImh0dHA6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL20vbWVj aGFuaXplL21lY2hhbml6ZS0wLjIuNS50YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICJt ZWNoYW5pemUtMC4yLjUvbWVjaGFuaXplIikKKyAgICAgICAgcmV0dXJuIHNlbGYuX2luc3RhbGwo Imh0dHA6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL20vbWVjaGFuaXplL21lY2hh bml6ZS0wLjIuNS50YXIuZ3oiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibWVjaGFu aXplLTAuMi41L21lY2hhbml6ZSIpCiAKICAgICBkZWYgX2luc3RhbGxfcGVwOChzZWxmKToKLSAg ICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3Vy Y2UvcC9wZXA4L3BlcDgtMC41LjAudGFyLmd6I21kNT01MTJhODE4YWY5OTc5MjkwY2Q2MTljY2U4 ZTljMmUyYiIsCi0gICAgICAgICAgICAgICAgICAgICAgInBlcDgtMC41LjAvcGVwOC5weSIpCisg ICAgICAgIHJldHVybiBzZWxmLl9pbnN0YWxsKCJodHRwOi8vcHlwaS5weXRob24ub3JnL3BhY2th Z2VzL3NvdXJjZS9wL3BlcDgvcGVwOC0wLjUuMC50YXIuZ3ojbWQ1PTUxMmE4MThhZjk5NzkyOTBj ZDYxOWNjZThlOWMyZTJiIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInBlcDgtMC41 LjAvcGVwOC5weSIpCiAKICAgICBkZWYgX2luc3RhbGxfcHlsaW50KHNlbGYpOgorICAgICAgICBp bnN0YWxsZWRfc29tZXRoaW5nID0gRmFsc2UKICAgICAgICAgaWYgbm90IHNlbGYuX2ZzLmV4aXN0 cyhzZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgInB5bGludCIpKToKLSAgICAgICAg ICAgIHNlbGYuX2luc3RhbGwoJ2h0dHA6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNl L3AvcHlsaW50L3B5bGludC0wLjI1LjEudGFyLmd6I21kNT03MjhiYmMyYjMzOWJjMzc0OWFmMDEz NzA5YTdmODdhNScsICdweWxpbnQtMC4yNS4xJykKKyAgICAgICAgICAgIGluc3RhbGxlZF9zb21l dGhpbmcgPSBzZWxmLl9pbnN0YWxsKCdodHRwOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3Nv dXJjZS9wL3B5bGludC9weWxpbnQtMC4yNS4xLnRhci5neiNtZDU9NzI4YmJjMmIzMzliYzM3NDlh ZjAxMzcwOWE3Zjg3YTUnLCAncHlsaW50LTAuMjUuMScpCiAgICAgICAgICAgICBzZWxmLl9mcy5t b3ZlKHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAicHlsaW50LTAuMjUuMSIpLCBz ZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgInB5bGludCIpKQotCisgICAgICAgIHJl dHVybiBpbnN0YWxsZWRfc29tZXRoaW5nCiAKICAgICAjIGF1dG9pbnN0YWxsZWQuYnVpbGRib3Qg aXMgdXNlZCBieSBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0 ZXJjZmdfdW5pdHRlc3QucHkKICAgICAjIGFuZCBzaG91bGQgaWRlYWxseSBtYXRjaCB0aGUgdmVy c2lvbiBvZiBCdWlsZEJvdCB1c2VkIGF0IGJ1aWxkLndlYmtpdC5vcmcuCkBAIC0xMTMsMjQgKzEx NCwyNCBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgIyB3 aXRob3V0IGluY2x1ZGluZyBvdGhlciBtb2R1bGVzIGFzIGEgc2lkZSBlZmZlY3QuCiAgICAgICAg IGppbmphX2RpciA9IHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAiamluamEyIikK ICAgICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxlcihhcHBlbmRfdG9fc2VhcmNoX3BhdGg9 VHJ1ZSwgdGFyZ2V0X2Rpcj1qaW5qYV9kaXIpCi0gICAgICAgIGluc3RhbGxlci5pbnN0YWxsKHVy bD0iaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvSi9KaW5qYTIvSmluamEy LTIuNi50YXIuZ3ojbWQ1PTFjNDlhODgyNWM5OTNiZmRjZjU1YmIzNjg5N2QyOGEyIiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgdXJsX3N1YnBhdGg9IkppbmphMi0yLjYvamluamEyIikKKyAg ICAgICAgaW5zdGFsbGVkX3NvbWV0aGluZyA9IGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cDov L3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvSi9KaW5qYTIvSmluamEyLTIuNi50YXIu Z3ojbWQ1PTFjNDlhODgyNWM5OTNiZmRjZjU1YmIzNjg5N2QyOGEyIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVybF9zdWJwYXRoPSJKaW5qYTItMi42 L2ppbmphMiIpCiAKICAgICAgICAgU1FMQWxjaGVteV9kaXIgPSBzZWxmLl9mcy5qb2luKF9BVVRP SU5TVEFMTEVEX0RJUiwgInNxbGFsY2hlbXkiKQogICAgICAgICBpbnN0YWxsZXIgPSBBdXRvSW5z dGFsbGVyKGFwcGVuZF90b19zZWFyY2hfcGF0aD1UcnVlLCB0YXJnZXRfZGlyPVNRTEFsY2hlbXlf ZGlyKQotICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHA6Ly9weXBpLnB5dGhvbi5v cmcvcGFja2FnZXMvc291cmNlL1MvU1FMQWxjaGVteS9TUUxBbGNoZW15LTAuNy43LnRhci5neiNt ZDU9ZGRmNmRmN2UwMTRjZWEzMThmYTk4MTM2NGYzZjkzYjkiLAotICAgICAgICAgICAgICAgICAg ICAgICAgICB1cmxfc3VicGF0aD0iU1FMQWxjaGVteS0wLjcuNy9saWIvc3FsYWxjaGVteSIpCisg ICAgICAgIGluc3RhbGxlZF9zb21ldGhpbmcgfD0gaW5zdGFsbGVyLmluc3RhbGwodXJsPSJodHRw Oi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3NvdXJjZS9TL1NRTEFsY2hlbXkvU1FMQWxjaGVt eS0wLjcuNy50YXIuZ3ojbWQ1PWRkZjZkZjdlMDE0Y2VhMzE4ZmE5ODEzNjRmM2Y5M2I5IiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cmxfc3VicGF0 aD0iU1FMQWxjaGVteS0wLjcuNy9saWIvc3FsYWxjaGVteSIpCiAKLSAgICAgICAgc2VsZi5faW5z dGFsbCgiaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvYi9idWlsZGJvdC9i dWlsZGJvdC0wLjguNnAxLnRhci5neiNtZDU9YjY3MjdkMjgxMGM2OTIwNjJjNjU3NDkyYmNiZWFj NmEiLCAiYnVpbGRib3QtMC44LjZwMS9idWlsZGJvdCIpCisgICAgICAgIGluc3RhbGxlZF9zb21l dGhpbmcgfD0gc2VsZi5faW5zdGFsbCgiaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9z b3VyY2UvYi9idWlsZGJvdC9idWlsZGJvdC0wLjguNnAxLnRhci5neiNtZDU9YjY3MjdkMjgxMGM2 OTIwNjJjNjU3NDkyYmNiZWFjNmEiLCAiYnVpbGRib3QtMC44LjZwMS9idWlsZGJvdCIpCisgICAg ICAgIHJldHVybiBpbnN0YWxsZWRfc29tZXRoaW5nCiAKICAgICBkZWYgX2luc3RhbGxfY292ZXJh Z2Uoc2VsZik6CiAgICAgICAgIGluc3RhbGxlciA9IEF1dG9JbnN0YWxsZXIodGFyZ2V0X2Rpcj1f QVVUT0lOU1RBTExFRF9ESVIpCi0gICAgICAgIGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cDov L3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvYy9jb3ZlcmFnZS9jb3ZlcmFnZS0zLjUu MS50YXIuZ3ojbWQ1PTQxMGQ0YzgxNTVhNGRhYjIyMmYyYmM1MTIxMmQ0YTI0IiwgdXJsX3N1YnBh dGg9ImNvdmVyYWdlLTMuNS4xL2NvdmVyYWdlIikKKyAgICAgICAgcmV0dXJuIGluc3RhbGxlci5p bnN0YWxsKHVybD0iaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvYy9jb3Zl cmFnZS9jb3ZlcmFnZS0zLjUuMS50YXIuZ3ojbWQ1PTQxMGQ0YzgxNTVhNGRhYjIyMmYyYmM1MTIx MmQ0YTI0IiwgdXJsX3N1YnBhdGg9ImNvdmVyYWdlLTMuNS4xL2NvdmVyYWdlIikKIAogICAgIGRl ZiBfaW5zdGFsbF9lbGl6YShzZWxmKToKICAgICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxl cih0YXJnZXRfZGlyPV9BVVRPSU5TVEFMTEVEX0RJUikKLSAgICAgICAgaW5zdGFsbGVyLmluc3Rh bGwodXJsPSJodHRwOi8vd3d3LmFkYW1iYXJ0aC5jb20vd2Via2l0L2VsaXphIiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgdGFyZ2V0X25hbWU9ImVsaXphLnB5IikKKyAgICAgICAgcmV0dXJu IGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cDovL3d3dy5hZGFtYmFydGguY29tL3dlYmtpdC9l bGl6YSIsIHRhcmdldF9uYW1lPSJlbGl6YS5weSIpCiAKICAgICBkZWYgX2luc3RhbGxfaXJjKHNl bGYpOgogICAgICAgICAjIFNpbmNlIGlyY2xpYiBhbmQgaXJjYm90IGFyZSB0d28gdG9wLWxldmVs IHBhY2thZ2VzLCB3ZSBuZWVkIHRvIGltcG9ydApAQCAtMTM4LDIzICsxMzksMjYgQEAgY2xhc3Mg QXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgICMgb3JnYW5pemF0aW9uIHB1 cnBvc2VzLgogICAgICAgICBpcmNfZGlyID0gc2VsZi5fZnMuam9pbihfQVVUT0lOU1RBTExFRF9E SVIsICJpcmMiKQogICAgICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9 aXJjX2RpcikKLSAgICAgICAgaW5zdGFsbGVyLmluc3RhbGwodXJsPSJodHRwOi8vZG93bmxvYWRz LnNvdXJjZWZvcmdlLm5ldC9wcm9qZWN0L3B5dGhvbi1pcmNsaWIvcHl0aG9uLWlyY2xpYi8wLjQu OC9weXRob24taXJjbGliLTAuNC44LnppcCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIHVy bF9zdWJwYXRoPSJpcmNsaWIucHkiKQotICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0 dHA6Ly9kb3dubG9hZHMuc291cmNlZm9yZ2UubmV0L3Byb2plY3QvcHl0aG9uLWlyY2xpYi9weXRo b24taXJjbGliLzAuNC44L3B5dGhvbi1pcmNsaWItMC40LjguemlwIiwKKyAgICAgICAgaW5zdGFs bGVkX3NvbWV0aGluZyA9IGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cDovL2Rvd25sb2Fkcy5z b3VyY2Vmb3JnZS5uZXQvcHJvamVjdC9weXRob24taXJjbGliL3B5dGhvbi1pcmNsaWIvMC40Ljgv cHl0aG9uLWlyY2xpYi0wLjQuOC56aXAiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdXJsX3N1YnBhdGg9ImlyY2xpYi5weSIpCisgICAgICAgIGluc3Rh bGxlZF9zb21ldGhpbmcgfD0gaW5zdGFsbGVyLmluc3RhbGwodXJsPSJodHRwOi8vZG93bmxvYWRz LnNvdXJjZWZvcmdlLm5ldC9wcm9qZWN0L3B5dGhvbi1pcmNsaWIvcHl0aG9uLWlyY2xpYi8wLjQu OC9weXRob24taXJjbGliLTAuNC44LnppcCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIHVy bF9zdWJwYXRoPSJpcmNib3QucHkiKQorICAgICAgICByZXR1cm4gaW5zdGFsbGVkX3NvbWV0aGlu ZwogCiAgICAgZGVmIF9pbnN0YWxsX3dlYnBhZ2VyZXBsYXkoc2VsZik6CisgICAgICAgIGluc3Rh bGxlZF9zb21ldGhpbmcgPSBGYWxzZQogICAgICAgICBpZiBub3Qgc2VsZi5fZnMuZXhpc3RzKHNl bGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAid2VicGFnZXJlcGxheSIpKToKLSAgICAg ICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHA6Ly93ZWItcGFnZS1yZXBsYXkuZ29vZ2xlY29kZS5j b20vZmlsZXMvd2VicGFnZXJlcGxheS0xLjEuMi50YXIuZ3oiLCAid2VicGFnZXJlcGxheS0xLjEu MiIpCisgICAgICAgICAgICBpbnN0YWxsZWRfc29tZXRoaW5nID0gc2VsZi5faW5zdGFsbCgiaHR0 cDovL3dlYi1wYWdlLXJlcGxheS5nb29nbGVjb2RlLmNvbS9maWxlcy93ZWJwYWdlcmVwbGF5LTEu MS4yLnRhci5neiIsICJ3ZWJwYWdlcmVwbGF5LTEuMS4yIikKICAgICAgICAgICAgIHNlbGYuX2Zz Lm1vdmUoc2VsZi5fZnMuam9pbihfQVVUT0lOU1RBTExFRF9ESVIsICJ3ZWJwYWdlcmVwbGF5LTEu MS4yIiksIHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAid2VicGFnZXJlcGxheSIp KQogCiAgICAgICAgIGluaXRfcGF0aCA9IHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElS LCAid2VicGFnZXJlcGxheSIsICJfX2luaXRfXy5weSIpCiAgICAgICAgIGlmIG5vdCBzZWxmLl9m cy5leGlzdHMoaW5pdF9wYXRoKToKICAgICAgICAgICAgIHNlbGYuX2ZzLndyaXRlX3RleHRfZmls ZShpbml0X3BhdGgsICIiKQorICAgICAgICByZXR1cm4gaW5zdGFsbGVkX3NvbWV0aGluZwogCiAg ICAgZGVmIF9pbnN0YWxsKHNlbGYsIHVybCwgdXJsX3N1YnBhdGgpOgogICAgICAgICBpbnN0YWxs ZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9X0FVVE9JTlNUQUxMRURfRElSKQotICAgICAg ICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9dXJsLCB1cmxfc3VicGF0aD11cmxfc3VicGF0aCkKKyAg ICAgICAgcmV0dXJuIGluc3RhbGxlci5pbnN0YWxsKHVybD11cmwsIHVybF9zdWJwYXRoPXVybF9z dWJwYXRoKQogCiAKIF9ob29rID0gQXV0b2luc3RhbGxJbXBvcnRIb29rKCkKQEAgLTE2Myw1ICsx NjcsNyBAQCBzeXMubWV0YV9wYXRoLmFwcGVuZChfaG9vaykKIAogZGVmIGF1dG9pbnN0YWxsX2V2 ZXJ5dGhpbmcoKToKICAgICBpbnN0YWxsX21ldGhvZHMgPSBbbWV0aG9kIGZvciBtZXRob2QgaW4g ZGlyKF9ob29rLl9fY2xhc3NfXykgaWYgbWV0aG9kLnN0YXJ0c3dpdGgoJ19pbnN0YWxsXycpXQor ICAgIGluc3RhbGxlZF9zb21ldGhpbmcgPSBGYWxzZQogICAgIGZvciBtZXRob2QgaW4gaW5zdGFs bF9tZXRob2RzOgotICAgICAgICBnZXRhdHRyKF9ob29rLCBtZXRob2QpKCkKKyAgICAgICAgaW5z dGFsbGVkX3NvbWV0aGluZyB8PSBnZXRhdHRyKF9ob29rLCBtZXRob2QpKCkKKyAgICByZXR1cm4g aW5zdGFsbGVkX3NvbWV0aGluZwo=