57704 2011-04-02 04:09:04 -0700 Remove AbstractStep._run_script and move script names to ports.py 2011-04-02 05:16:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 paroga paroga commit-queue eric oldest_to_newest 378380 0 paroga 2011-04-02 04:09:04 -0700 Remove AbstractStep._run_script and move script names to ports.py 378381 1 87974 paroga 2011-04-02 04:14:32 -0700 Created attachment 87974 Patch 378384 2 87974 eric 2011-04-02 04:48:23 -0700 Comment on attachment 87974 Patch Sigh. Well, this is a good thing to do, but there are two troubles I should point outin this patch. 1. ports.py should die. class methods aren't long-term scaleable. We have a port.py over in layout_tests which we eventually want to merge it with/replace it with. Second, run_and_throw_if_fail also is deprecated and should die. :) That said, this is a great change to get rid of a fixme! I'm glad to see you workign on webkitpy! 378385 3 87974 commit-queue 2011-04-02 05:15:59 -0700 Comment on attachment 87974 Patch Clearing flags on attachment: 87974 Committed r82771: <http://trac.webkit.org/changeset/82771> 378386 4 commit-queue 2011-04-02 05:16:04 -0700 All reviewed patches have been landed. Closing bug. 87974 2011-04-02 04:14:32 -0700 2011-04-02 05:15:59 -0700 Patch bug-57704-20110402131429.patch text/plain 11235 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogODI3NjkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMWU0NDkwODY5MGRkNDBiZmQ4M2E5Y2IzYjJjMjE5MjMy OGRkOWE4Li5hNWQyN2E5ZDk5NGUxZWFmNWJkOTJjZTUyMzU2NGNjZjg2ODBhZDMyIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDQtMDIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIEFi c3RyYWN0U3RlcC5fcnVuX3NjcmlwdCBhbmQgbW92ZSBzY3JpcHQgbmFtZXMgdG8gcG9ydHMucHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NzA0CisK KyAgICAgICAgUmVwbGFjZSBkZXByZWNhdGVkIF9ydW5fc2NyaXB0IHdpdGggX3Rvb2wuZXhlY3V0 aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NvbmZpZy9wb3J0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JvbGxfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9jaGVja3N0eWxlLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nZm9yZGVwc3JvbGwucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVjaGFuZ2Vsb2dmb3JyZXZl cnQucHk6CisKIDIwMTEtMDQtMDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQppbmRleCA5YTVhMjY5YzZhYmU0NTQ4ZTU5NzgxOTkx ZjkwYjQyMjk1YmE5M2RmLi4wZjQ0ZTgwOWRlOTk4NDhhOGUxNjFkMmUyYjg1NTZjOGQ1N2Q3YTNh IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5CkBA IC04Myw2ICs4MywxNCBAQCBjbGFzcyBXZWJLaXRQb3J0KG9iamVjdCk6CiAgICAgICAgIHJldHVy biBjbHMuc2NyaXB0X3NoZWxsX2NvbW1hbmQoInVwZGF0ZS13ZWJraXQiKQogCiAgICAgQGNsYXNz bWV0aG9kCisgICAgZGVmIGNoZWNrX3dlYmtpdF9zdHlsZV9jb21tYW5kKGNscyk6CisgICAgICAg IHJldHVybiBjbHMuc2NyaXB0X3NoZWxsX2NvbW1hbmQoImNoZWNrLXdlYmtpdC1zdHlsZSIpCisK KyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgcHJlcGFyZV9jaGFuZ2Vsb2dfY29tbWFuZChjbHMp OgorICAgICAgICByZXR1cm4gY2xzLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJwcmVwYXJlLUNoYW5n ZUxvZyIpCisKKyAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQo Y2xzLCBidWlsZF9zdHlsZT1Ob25lKToKICAgICAgICAgY29tbWFuZCA9IGNscy5zY3JpcHRfc2hl bGxfY29tbWFuZCgiYnVpbGQtd2Via2l0IikKICAgICAgICAgaWYgYnVpbGRfc3R5bGUgPT0gImRl YnVnIjoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9k b3dubG9hZF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9kb3dubG9hZF91bml0dGVzdC5weQppbmRleCBjZWQ1YjJmMWY0MmQ5ZDY5NGQ5OWQ4MDE3MDNl MzhjNTZhODBlODI2Li4wYTgzZjk0N2RjY2I4Yjg2MjFiNmFjNjU4NWQ2N2UxYmY2ZWNhYWU2IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRf dW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rv d25sb2FkX3VuaXR0ZXN0LnB5CkBAIC0xMjMsNyArMTIzLDcgQEAgY2xhc3MgRG93bmxvYWRDb21t YW5kc1Rlc3QoQ29tbWFuZHNUZXN0KToKICAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRw dXRzKExhbmQoKSwgWzQyXSwgb3B0aW9ucz1zZWxmLl9kZWZhdWx0X29wdGlvbnMoKSwgZXhwZWN0 ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVyciwgdG9vbD1tb2NrX3Rvb2wpCiAKICAgICBkZWYgdGVz dF9jaGVja19zdHlsZShzZWxmKToKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIlByb2Nlc3Np bmcgMSBwYXRjaCBmcm9tIDEgYnVnLlxuVXBkYXRpbmcgd29ya2luZyBkaXJlY3RvcnlcblByb2Nl c3NpbmcgcGF0Y2ggMTk3IGZyb20gYnVnIDQyLlxuUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGVc biIKKyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIlByb2Nlc3NpbmcgMSBwYXRjaCBmcm9tIDEg YnVnLlxuVXBkYXRpbmcgd29ya2luZyBkaXJlY3RvcnlcblByb2Nlc3NpbmcgcGF0Y2ggMTk3IGZy b20gYnVnIDQyLlxuIgogICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoQ2hlY2tT dHlsZSgpLCBbMTk3XSwgb3B0aW9ucz1zZWxmLl9kZWZhdWx0X29wdGlvbnMoKSwgZXhwZWN0ZWRf c3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRlZiB0ZXN0X2J1aWxkX2F0dGFjaG1lbnQo c2VsZik6CkBAIC0xNzEsNyArMTcxLDcgQEAgTm90IGNsb3NpbmcgYnVnIDQyIGFzIGF0dGFjaG1l bnQgMTk3IGhhcyByZXZpZXc9Ky4gIEFzc3VtaW5nIHRoZXJlIGFyZSBtb3JlIHBhdGMKICAgICAg ICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKExhbmRGcm9tQnVnKCksIFs0Ml0sIG9wdGlv bnM9c2VsZi5fZGVmYXVsdF9vcHRpb25zKCksIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRl cnIpCiAKICAgICBkZWYgdGVzdF9wcmVwYXJlX3JvbGxvdXQoc2VsZik6Ci0gICAgICAgIGV4cGVj dGVkX3N0ZGVyciA9ICJQcmVwYXJpbmcgcm9sbG91dCBmb3IgYnVnIDQyLlxuVXBkYXRpbmcgd29y a2luZyBkaXJlY3RvcnlcblJ1bm5pbmcgcHJlcGFyZS1DaGFuZ2VMb2dcbiIKKyAgICAgICAgZXhw ZWN0ZWRfc3RkZXJyID0gIlByZXBhcmluZyByb2xsb3V0IGZvciBidWcgNDIuXG5VcGRhdGluZyB3 b3JraW5nIGRpcmVjdG9yeVxuIgogICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMo UHJlcGFyZVJvbGxvdXQoKSwgWzg1MiwgIlJlYXNvbiJdLCBvcHRpb25zPXNlbGYuX2RlZmF1bHRf b3B0aW9ucygpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVmIHRl c3RfY3JlYXRlX3JvbGxvdXQoc2VsZik6CkBAIC0xODQsNyArMTg0LDYgQEAgUmVhc29uCiBjb21w b25lbnQ6IE1PQ0sgY29tcG9uZW50CiBjYzogTU9DSyBjYwogYmxvY2tlZDogNDIKLVJ1bm5pbmcg cHJlcGFyZS1DaGFuZ2VMb2cKIE1PQ0sgYWRkX3BhdGNoX3RvX2J1ZzogYnVnX2lkPTc4LCBkZXNj cmlwdGlvbj1ST0xMT1VUIG9mIHI4NTIsIG1hcmtfZm9yX3Jldmlldz1GYWxzZSwgbWFya19mb3Jf Y29tbWl0X3F1ZXVlPVRydWUsIG1hcmtfZm9yX2xhbmRpbmc9RmFsc2UKIC0tIEJlZ2luIGNvbW1l bnQgLS0KIEFueSBjb21taXR0ZXIgY2FuIGxhbmQgdGhpcyBwYXRjaCBhdXRvbWF0aWNhbGx5IGJ5 IG1hcmtpbmcgaXQgY29tbWl0LXF1ZXVlKy4gIFRoZSBjb21taXQtcXVldWUgd2lsbCBidWlsZCBh bmQgdGVzdCB0aGUgcGF0Y2ggYmVmb3JlIGxhbmRpbmcgdG8gZW5zdXJlIHRoYXQgdGhlIHJvbGxv dXQgd2lsbCBiZSBzdWNjZXNzZnVsLiAgVGhpcyBwcm9jZXNzIHRha2VzIGFwcHJveGltYXRlbHkg MTUgbWludXRlcy4KQEAgLTIwMiw3ICsyMDEsNiBAQCB3aGVyZSBBVFRBQ0hNRU5UX0lEIGlzIHRo ZSBJRCBvZiB0aGlzIGF0dGFjaG1lbnQuCiAgICAgZGVmIHRlc3Rfcm9sbG91dChzZWxmKToKICAg ICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIiIiUHJlcGFyaW5nIHJvbGxvdXQgZm9yIGJ1ZyA0Mi4K IFVwZGF0aW5nIHdvcmtpbmcgZGlyZWN0b3J5Ci1SdW5uaW5nIHByZXBhcmUtQ2hhbmdlTG9nCiBN T0NLOiB1c2VyLm9wZW5fdXJsOiBmaWxlOi8vLi4uCiBXYXMgdGhhdCBkaWZmIGNvcnJlY3Q/CiBC dWlsZGluZyBXZWJLaXQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9yb2xsX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3JvbGxfdW5pdHRlc3QucHkKaW5kZXggYjZmNjllYTVkYTk3ZDU3NGNiODNhY2NmNzI3 MjRjYjQ2MzM5MDdjMS4uZGE1YzYzNTc3NTkwOGY2YTM2YjNhNzNjYTRiMGQwOGQ1ZTkyOTBiZCAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JvbGxfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JvbGxf dW5pdHRlc3QucHkKQEAgLTM2LDcgKzM2LDYgQEAgY2xhc3MgUm9sbENvbW1hbmRzVGVzdChDb21t YW5kc1Rlc3QpOgogICAgIGRlZiB0ZXN0X3VwZGF0ZV9jaHJvbWl1bV9kZXBzKHNlbGYpOgogICAg ICAgICBleHBlY3RlZF9zdGRlcnIgPSAiIiJVcGRhdGluZyBDaHJvbWl1bSBERVBTIHRvIDY3NjQK IE1PQ0s6IE1vY2tERVBTLndyaXRlX3ZhcmlhYmxlKGNocm9taXVtX3JldiwgNjc2NCkKLVJ1bm5p bmcgcHJlcGFyZS1DaGFuZ2VMb2cKIE1PQ0s6IHVzZXIub3Blbl91cmw6IGZpbGU6Ly8uLi4KIFdh cyB0aGF0IGRpZmYgY29ycmVjdD8KIENvbW1pdHRlZCByNDk4MjQ6IDxodHRwOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC80OTgyND4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CmluZGV4IDQzMTNkZjk2OTk1Yjli YmNhOTI5YTJhZDA0ODFkYzQzMDZkYzI3ZmIuLjQ4NzA0MjNhYjhmOGFhM2QyNDgwMTljNTBlODRj Y2UxNzUzNmE2ZDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy91cGxvYWRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weQpAQCAtNTksOCArNTksNyBAQCBjbGFzcyBVcGxv YWRDb21tYW5kc1Rlc3QoQ29tbWFuZHNUZXN0KToKICAgICAgICAgb3B0aW9ucy5yZXF1ZXN0X2Nv bW1pdCA9IEZhbHNlCiAgICAgICAgIG9wdGlvbnMucmV2aWV3ID0gVHJ1ZQogICAgICAgICBvcHRp b25zLnN1Z2dlc3RfcmV2aWV3ZXJzID0gRmFsc2UKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0g IiIiUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGUKLU1PQ0s6IHVzZXIub3Blbl91cmw6IGZpbGU6 Ly8uLi4KKyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIiIiTU9DSzogdXNlci5vcGVuX3VybDog ZmlsZTovLy4uLgogV2FzIHRoYXQgZGlmZiBjb3JyZWN0PwogT2Jzb2xldGluZyAyIG9sZCBwYXRj aGVzIG9uIGJ1ZyA0MgogTU9DSyBhZGRfcGF0Y2hfdG9fYnVnOiBidWdfaWQ9NDIsIGRlc2NyaXB0 aW9uPU1PQ0sgZGVzY3JpcHRpb24sIG1hcmtfZm9yX3Jldmlldz1UcnVlLCBtYXJrX2Zvcl9jb21t aXRfcXVldWU9RmFsc2UsIG1hcmtfZm9yX2xhbmRpbmc9RmFsc2UKQEAgLTEwNyw4ICsxMDYsNyBA QCBleHRyYSBjb21tZW50CiAgICAgICAgIG9wdGlvbnMucmVxdWVzdF9jb21taXQgPSBGYWxzZQog ICAgICAgICBvcHRpb25zLnJldmlldyA9IFRydWUKICAgICAgICAgb3B0aW9ucy5zdWdnZXN0X3Jl dmlld2VycyA9IEZhbHNlCi0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICIiIlJ1bm5pbmcgY2hl Y2std2Via2l0LXN0eWxlCi1NT0NLOiB1c2VyLm9wZW5fdXJsOiBmaWxlOi8vLi4uCisgICAgICAg IGV4cGVjdGVkX3N0ZGVyciA9ICIiIk1PQ0s6IHVzZXIub3Blbl91cmw6IGZpbGU6Ly8uLi4KIFdh cyB0aGF0IGRpZmYgY29ycmVjdD8KIE9ic29sZXRpbmcgMiBvbGQgcGF0Y2hlcyBvbiBidWcgNDIK IE1PQ0sgYWRkX3BhdGNoX3RvX2J1ZzogYnVnX2lkPTQyLCBkZXNjcmlwdGlvbj1NT0NLIGRlc2Ny aXB0aW9uLCBtYXJrX2Zvcl9yZXZpZXc9VHJ1ZSwgbWFya19mb3JfY29tbWl0X3F1ZXVlPUZhbHNl LCBtYXJrX2Zvcl9sYW5kaW5nPUZhbHNlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weQppbmRleCAyYmE0MjkxZjZkMzkzZGI4MTk3ZGNjNWVh ZjlkMzZhNDBkZDdmYTNmLi41OWVhMzZhYWMyZTdjNmQ4NWQ5NDA5N2U2OWEzYTkyNjc5Y2Y2MzNh IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3Rz dGVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFjdHN0 ZXAucHkKQEAgLTI2LDcgKzI2LDYgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAK LWZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGxv ZwogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJy b3IKIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgV2ViS2l0UG9ydAog ZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLm9wdGlvbnMgaW1wb3J0IE9wdGlvbnMKQEAgLTM3LDE0 ICszNiw2IEBAIGNsYXNzIEFic3RyYWN0U3RlcChvYmplY3QpOgogICAgICAgICBzZWxmLl90b29s ID0gdG9vbAogICAgICAgICBzZWxmLl9vcHRpb25zID0gb3B0aW9ucwogCi0gICAgIyBGSVhNRTog VGhpcyBzaG91bGQgdXNlIHRvb2wucG9ydCgpCi0gICAgZGVmIF9ydW5fc2NyaXB0KHNlbGYsIHNj cmlwdF9uYW1lLCBhcmdzPU5vbmUsIHF1aWV0PUZhbHNlLCBwb3J0PVdlYktpdFBvcnQpOgotICAg ICAgICBsb2coIlJ1bm5pbmcgJXMiICUgc2NyaXB0X25hbWUpCi0gICAgICAgIGNvbW1hbmQgPSBw b3J0LnNjcmlwdF9zaGVsbF9jb21tYW5kKHNjcmlwdF9uYW1lKQotICAgICAgICBpZiBhcmdzOgot ICAgICAgICAgICAgY29tbWFuZC5leHRlbmQoYXJncykKLSAgICAgICAgc2VsZi5fdG9vbC5leGVj dXRpdmUucnVuX2FuZF90aHJvd19pZl9mYWlsKGNvbW1hbmQsIHF1aWV0KQotCiAgICAgZGVmIF9j aGFuZ2VkX2ZpbGVzKHNlbGYsIHN0YXRlKToKICAgICAgICAgcmV0dXJuIHNlbGYuY2FjaGVkX2xv b2t1cChzdGF0ZSwgImNoYW5nZWRfZmlsZXMiKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvY2hlY2tzdHlsZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9jaGVja3N0eWxlLnB5CmluZGV4IGFmNjZjNTBkYmEwY2Y3OGYyMWJiNjYx OGIzZmQ1ZTdiNjI5ZDIwMjAuLjQ2YzQwOWM4Nzk2MmQ3MjdmNmQzOTExNTdiNjQyNTE1NTE4YWJh ZTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jaGVja3N0 eWxlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jaGVja3N0eWxl LnB5CkBAIC01Niw3ICs1Niw3IEBAIGNsYXNzIENoZWNrU3R5bGUoQWJzdHJhY3RTdGVwKToKICAg ICAgICAgYXJncy5leHRlbmQoc2VsZi5fY2hhbmdlZF9maWxlcyhzdGF0ZSkpCiAKICAgICAgICAg dHJ5OgotICAgICAgICAgICAgc2VsZi5fcnVuX3NjcmlwdCgiY2hlY2std2Via2l0LXN0eWxlIiwg YXJncykKKyAgICAgICAgICAgIHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZf ZmFpbChzZWxmLl90b29sLnBvcnQoKS5jaGVja193ZWJraXRfc3R5bGVfY29tbWFuZCgpKQogICAg ICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6CiAgICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25z Lm5vbl9pbnRlcmFjdGl2ZToKICAgICAgICAgICAgICAgICAjIFdlIG5lZWQgdG8gcmUtcmFpc2Ug dGhlIGV4Y2VwdGlvbiBoZXJlIHRvIGhhdmUgdGhlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CmluZGV4IDRiZTQwY2E2ODkx NTM3NTVjY2YwOGE4ODUxMTkwNGZiNzgxMDJhZjcuLmIzMGRkMmZkMWZiOWI3ZjVhODFlODc2Mjc4 MmY2NzkzZDRkMmFkZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CkBAIC02MSw3ICs2MSw3IEBAIGNsYXNzIFByZXBh cmVDaGFuZ2VMb2coQWJzdHJhY3RTdGVwKToKICAgICAgICAgICAgIHNlbGYuX2Vuc3VyZV9idWdf dXJsKHN0YXRlKQogICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgIG9zLmNoZGlyKHNlbGYuX3Rv b2wuc2NtKCkuY2hlY2tvdXRfcm9vdCkKLSAgICAgICAgYXJncyA9IHNlbGYuX3Rvb2wucG9ydCgp LnNjcmlwdF9zaGVsbF9jb21tYW5kKCJwcmVwYXJlLUNoYW5nZUxvZyIpCisgICAgICAgIGFyZ3Mg PSBzZWxmLl90b29sLnBvcnQoKS5wcmVwYXJlX2NoYW5nZWxvZ19jb21tYW5kKCkKICAgICAgICAg aWYgc3RhdGUuZ2V0KCJidWdfaWQiKToKICAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLWJ1Zz0l cyIgJSBzdGF0ZVsiYnVnX2lkIl0pCiAgICAgICAgICAgICBhcmdzLmFwcGVuZCgiLS1kZXNjcmlw dGlvbj0lcyIgJSBzZWxmLl90b29sLmJ1Z3MuZmV0Y2hfYnVnKHN0YXRlWyJidWdfaWQiXSkudGl0 bGUoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVw YXJlY2hhbmdlbG9nZm9yZGVwc3JvbGwucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvcHJlcGFyZWNoYW5nZWxvZ2ZvcmRlcHNyb2xsLnB5CmluZGV4IDM5YzlhOWFiNTNkMjg2 MDRjZWJiZDkyY2U0YWY5ZThjZmZiMGE5MjguLmU2MzZjYjQ2MTMwNjEyMmZhY2QxYTgxOTlkMjA2 ZjI3NjEyYzM4ZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVw cy9wcmVwYXJlY2hhbmdlbG9nZm9yZGVwc3JvbGwucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL3N0ZXBzL3ByZXBhcmVjaGFuZ2Vsb2dmb3JkZXBzcm9sbC5weQpAQCAtMzQsNyAr MzQsNyBAQCBmcm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMuYWJzdHJhY3RzdGVwIGltcG9ydCBBYnN0 cmFjdFN0ZXAKIAogY2xhc3MgUHJlcGFyZUNoYW5nZUxvZ0ZvckRFUFNSb2xsKEFic3RyYWN0U3Rl cCk6CiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6Ci0gICAgICAgIHNlbGYuX3J1bl9zY3JpcHQo InByZXBhcmUtQ2hhbmdlTG9nIikKKyAgICAgICAgc2VsZi5fdG9vbC5leGVjdXRpdmUucnVuX2Fu ZF90aHJvd19pZl9mYWlsKHNlbGYuX3Rvb2wucG9ydCgpLnByZXBhcmVfY2hhbmdlbG9nX2NvbW1h bmQoKSkKICAgICAgICAgY2hhbmdlbG9nX3BhdGhzID0gc2VsZi5fdG9vbC5jaGVja291dCgpLm1v ZGlmaWVkX2NoYW5nZWxvZ3MoZ2l0X2NvbW1pdD1Ob25lKQogICAgICAgICBmb3IgY2hhbmdlbG9n X3BhdGggaW4gY2hhbmdlbG9nX3BhdGhzOgogICAgICAgICAgICAgQ2hhbmdlTG9nKGNoYW5nZWxv Z19wYXRoKS51cGRhdGVfd2l0aF91bnJldmlld2VkX21lc3NhZ2UoIlJvbGxlZCBERVBTLlxuXG4i KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVj aGFuZ2Vsb2dmb3JyZXZlcnQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv cHJlcGFyZWNoYW5nZWxvZ2ZvcnJldmVydC5weQppbmRleCBkY2Q0YjkzOTNjMjJmNjc1YzUwNWZl Y2Y2ZDI2OGRiZmM1NDc3ZDdjLi4wYTQ3NTczNzRmMzMzNmYzYTQ2NTdhYmMzNjQzMzEwZGJjMTlh OTY2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFy ZWNoYW5nZWxvZ2ZvcnJldmVydC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvcHJlcGFyZWNoYW5nZWxvZ2ZvcnJldmVydC5weQpAQCAtNTAsNyArNTAsNyBAQCBjbGFz cyBQcmVwYXJlQ2hhbmdlTG9nRm9yUmV2ZXJ0KEFic3RyYWN0U3RlcCk6CiAKICAgICBkZWYgcnVu KHNlbGYsIHN0YXRlKToKICAgICAgICAgIyBUaGlzIGNvdWxkIG1vdmUgdG8gcHJlcGFyZS1DaGFu Z2VMb2cgYnkgYWRkaW5nIGEgLS1yZXZlcnQ9IG9wdGlvbi4KLSAgICAgICAgc2VsZi5fcnVuX3Nj cmlwdCgicHJlcGFyZS1DaGFuZ2VMb2ciKQorICAgICAgICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5y dW5fYW5kX3Rocm93X2lmX2ZhaWwoc2VsZi5fdG9vbC5wb3J0KCkucHJlcGFyZV9jaGFuZ2Vsb2df Y29tbWFuZCgpKQogICAgICAgICBjaGFuZ2Vsb2dfcGF0aHMgPSBzZWxmLl90b29sLmNoZWNrb3V0 KCkubW9kaWZpZWRfY2hhbmdlbG9ncyhnaXRfY29tbWl0PU5vbmUpCiAgICAgICAgIGJ1Z191cmwg PSBzZWxmLl90b29sLmJ1Z3MuYnVnX3VybF9mb3JfYnVnX2lkKHN0YXRlWyJidWdfaWQiXSkgaWYg c3RhdGVbImJ1Z19pZCJdIGVsc2UgTm9uZQogICAgICAgICBtZXNzYWdlID0gc2VsZi5fbWVzc2Fn ZV9mb3JfcmV2ZXJ0KHN0YXRlWyJyZXZpc2lvbl9saXN0Il0sIHN0YXRlWyJyZWFzb24iXSwgYnVn X3VybCkK