76300 2012-01-13 13:09:11 -0800 Remove --dry-run support from webkit-patch 2012-01-13 15:28:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth dpranke eric ojan webkit.review.bot oldest_to_newest 535930 0 abarth 2012-01-13 13:09:11 -0800 Remove --dry-run support from webkit-patch 535932 1 122487 abarth 2012-01-13 13:11:19 -0800 Created attachment 122487 Patch 535941 2 122487 webkit.review.bot 2012-01-13 13:20:08 -0800 Comment on attachment 122487 Patch Rejecting attachment 122487 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: patching file Tools/Scripts/webkitpy/common/checkout/scm/svn.py patching file Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py patching file Tools/Scripts/webkitpy/test/main.py Hunk #1 FAILED at 53. Hunk #2 FAILED at 217. 2 out of 2 hunks FAILED -- saving rejects to file Tools/Scripts/webkitpy/test/main.py.rej patching file Tools/Scripts/webkitpy/tool/main.py Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Dirk Pranke', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/11228705 536036 3 abarth 2012-01-13 15:28:23 -0800 Committed r104998: <http://trac.webkit.org/changeset/104998> 122487 2012-01-13 13:11:19 -0800 2012-01-13 13:20:08 -0800 Patch bug-76300-20120113131118.patch text/plain 15287 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEwNDk3NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQ1IEBACisyMDEyLTAxLTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmVtb3ZlIC0tZHJ5LXJ1biBzdXBwb3J0IGZyb20gd2Via2l0LXBhdGNoCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjMwMAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGRvbid0IHVzZSB0 aGlzIGZ1bmN0aW9uYWxpdHkgZm9yIGFueXRoaW5nLCBhbmQgaXQgZG9lc24ndCByZWFsbHkKKyAg ICAgICAgd29yay4gIFNvbWVvbmUgaW4gI3dlYmtpdCB0cmllZCB1c2luZyBpdCBhbmQgYW5kIGdv dCBzYWQvY29uZnVzZWQuICBXZQorICAgICAgICBzaG91bGQganVzdCByZW1vdmUgaXQuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAg ICAgICAoR2l0LnB1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXIpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAgICAgIChTQ00uX19p bml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z Y21fdW5pdHRlc3QucHk6CisgICAgICAgIChfc2hhcmVkX3Rlc3RfY29tbWl0X3dpdGhfbWVzc2Fn ZSk6CisgICAgICAgIChHaXRTVk5UZXN0LnRlc3RfY29tbWl0X3RleHRfcGFyc2luZyk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKyAgICAg ICAgKFNWTi5jb21taXRfd2l0aF9tZXNzYWdlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHk6CisgICAgICAgIChCdWd6aWxsYS5fX2lu aXRfXyk6CisgICAgICAgIChCdWd6aWxsYS5xdWlwcyk6CisgICAgICAgIChCdWd6aWxsYS5hdXRo ZW50aWNhdGUpOgorICAgICAgICAoQnVnemlsbGEuYWRkX2F0dGFjaG1lbnRfdG9fYnVnKToKKyAg ICAgICAgKEJ1Z3ppbGxhLmFkZF9wYXRjaF90b19idWcpOgorICAgICAgICAoQnVnemlsbGEuY3Jl YXRlX2J1Zyk6CisgICAgICAgIChCdWd6aWxsYS5jbGVhcl9hdHRhY2htZW50X2ZsYWdzKToKKyAg ICAgICAgKEJ1Z3ppbGxhLnNldF9mbGFnX29uX2F0dGFjaG1lbnQpOgorICAgICAgICAoQnVnemls bGEub2Jzb2xldGVfYXR0YWNobWVudCk6CisgICAgICAgIChCdWd6aWxsYS5hZGRfY2NfdG9fYnVn KToKKyAgICAgICAgKEJ1Z3ppbGxhLnBvc3RfY29tbWVudF90b19idWcpOgorICAgICAgICAoQnVn emlsbGEuY2xvc2VfYnVnX2FzX2ZpeGVkKToKKyAgICAgICAgKEJ1Z3ppbGxhLnJlYXNzaWduX2J1 Zyk6CisgICAgICAgIChyZW9wZW5fYnVnKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rl c3QvbWFpbi5weToKKyAgICAgICAgKFRlc3Rlci5wYXJzZV9hcmdzKToKKyAgICAgICAgKFRlc3Rl ci5ydW5fdGVzdHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9tYWluLnB5Ogor ICAgICAgICAoV2ViS2l0UGF0Y2gpOgorICAgICAgICAoV2ViS2l0UGF0Y2guaGFuZGxlX2dsb2Jh bF9vcHRpb25zKToKKwogMjAxMi0wMS0xMyAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVt Lm9yZz4KIAogICAgICAgICB0ZXN0LXdlYmtpdHB5OiBhZGQgYmFzaWMgY29kZSBjb3ZlcmFnZSBz dXBwb3J0CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v Z2l0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L3NjbS9naXQucHkJKHJldmlzaW9uIDEwNDk3MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTQzNCwxNiAr NDM0LDExIEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgZGVmIHB1c2hf bG9jYWxfY29tbWl0c190b19zZXJ2ZXIoc2VsZiwgdXNlcm5hbWU9Tm9uZSwgcGFzc3dvcmQ9Tm9u ZSk6CiAgICAgICAgIGRjb21taXRfY29tbWFuZCA9IFsnZ2l0JywgJ3N2bicsICdkY29tbWl0J10K LSAgICAgICAgaWYgc2VsZi5kcnlydW46Ci0gICAgICAgICAgICBkY29tbWl0X2NvbW1hbmQuYXBw ZW5kKCctLWRyeS1ydW4nKQogICAgICAgICBpZiAobm90IHVzZXJuYW1lIG9yIG5vdCBwYXNzd29y ZCkgYW5kIG5vdCBzZWxmLmhhc19hdXRob3JpemF0aW9uX2Zvcl9yZWFsbShTVk4uc3ZuX3NlcnZl cl9yZWFsbSk6CiAgICAgICAgICAgICByYWlzZSBBdXRoZW50aWNhdGlvbkVycm9yKFNWTi5zdm5f c2VydmVyX2hvc3QsIHByb21wdF9mb3JfcGFzc3dvcmQ9VHJ1ZSkKICAgICAgICAgaWYgdXNlcm5h bWU6CiAgICAgICAgICAgICBkY29tbWl0X2NvbW1hbmQuZXh0ZW5kKFsiLS11c2VybmFtZSIsIHVz ZXJuYW1lXSkKICAgICAgICAgb3V0cHV0ID0gc2VsZi5ydW4oZGNvbW1pdF9jb21tYW5kLCBlcnJv cl9oYW5kbGVyPWNvbW1pdF9lcnJvcl9oYW5kbGVyLCBpbnB1dD1wYXNzd29yZCwgY3dkPXNlbGYu Y2hlY2tvdXRfcm9vdCkKLSAgICAgICAgIyBSZXR1cm4gYSBzdHJpbmcgd2hpY2ggbG9va3MgbGlr ZSBhIGNvbW1pdCBzbyB0aGF0IHRoaW5ncyB3aGljaCBwYXJzZSB0aGlzIG91dHB1dCB3aWxsIHN1 Y2NlZWQuCi0gICAgICAgIGlmIHNlbGYuZHJ5cnVuOgotICAgICAgICAgICAgb3V0cHV0ICs9ICJc bkNvbW1pdHRlZCByMCIKICAgICAgICAgcmV0dXJuIG91dHB1dAogCiAgICAgIyBUaGlzIGZ1bmN0 aW9uIHN1cHBvcnRzIHRoZSBmb2xsb3dpbmcgYXJndW1lbnQgZm9ybWF0czoKSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQkocmV2 aXNpb24gMTA0OTcyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3NjbS5weQkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNiBAQCBjbGFzcyBTQ006CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIGN3ZCwgZXhlY3V0aXZlPU5vbmUsIGZpbGVzeXN0ZW09Tm9u ZSk6CiAgICAgICAgIHNlbGYuY3dkID0gY3dkCiAgICAgICAgIHNlbGYuY2hlY2tvdXRfcm9vdCA9 IHNlbGYuZmluZF9jaGVja291dF9yb290KHNlbGYuY3dkKQotICAgICAgICBzZWxmLmRyeXJ1biA9 IEZhbHNlCiAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZSA9IGV4ZWN1dGl2ZSBvciBFeGVjdXRpdmUo KQogICAgICAgICBzZWxmLl9maWxlc3lzdGVtID0gZmlsZXN5c3RlbSBvciBGaWxlU3lzdGVtKCkK IApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxMDQ5NzIpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC03NTcsMTEgKzc1Nyw2IEBAIFExZFRCeDBBQUFCNDJpdGc0R2xnWUpqR3dN RER5T0RNeE1EdzM0R0IKICAgICAgICAgY29tbWl0X3RleHQgPSBzZWxmLnNjbS5jb21taXRfd2l0 aF9tZXNzYWdlKCJhbm90aGVyIHRlc3QgY29tbWl0IiwgdXNlcm5hbWUpCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoc2VsZi5zY20uc3ZuX3JldmlzaW9uX2Zyb21fY29tbWl0X3RleHQoY29tbWl0 X3RleHQpLCAnNicpCiAKLSAgICAgICAgc2VsZi5zY20uZHJ5cnVuID0gVHJ1ZQotICAgICAgICB3 cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgndGVzdF9maWxlJywgJ3N0aWxsIG1vcmUgdGVzdCBjb250 ZW50JykKLSAgICAgICAgY29tbWl0X3RleHQgPSBzZWxmLnNjbS5jb21taXRfd2l0aF9tZXNzYWdl KCJ5ZXQgYW5vdGhlciB0ZXN0IGNvbW1pdCIsIHVzZXJuYW1lKQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNlbGYuc2NtLnN2bl9yZXZpc2lvbl9mcm9tX2NvbW1pdF90ZXh0KGNvbW1pdF90ZXh0 KSwgJzAnKQotCiAgICAgZGVmIHRlc3RfY29tbWl0X2luX3N1YmRpcihzZWxmLCB1c2VybmFtZT1O b25lKToKICAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoJ3Rlc3RfZGlyL3Rlc3RfZmls ZTMnLCAnbW9yZSB0ZXN0IGNvbnRlbnQnKQogICAgICAgICBvcy5jaGRpcigidGVzdF9kaXIiKQpA QCAtMTIxNiwxMSArMTIxMSw2IEBAIGNsYXNzIEdpdFNWTlRlc3QoU0NNVGVzdCk6CiAgICAgICAg IGNvbW1pdF90ZXh0ID0gc2VsZi5zY20uY29tbWl0X3dpdGhfbWVzc2FnZSgiYW5vdGhlciB0ZXN0 IGNvbW1pdCIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5zY20uc3ZuX3JldmlzaW9u X2Zyb21fY29tbWl0X3RleHQoY29tbWl0X3RleHQpLCAnNicpCiAKLSAgICAgICAgc2VsZi5zY20u ZHJ5cnVuID0gVHJ1ZQotICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgndGVzdF9maWxl JywgJ3N0aWxsIG1vcmUgdGVzdCBjb250ZW50JykKLSAgICAgICAgY29tbWl0X3RleHQgPSBzZWxm LnNjbS5jb21taXRfd2l0aF9tZXNzYWdlKCJ5ZXQgYW5vdGhlciB0ZXN0IGNvbW1pdCIpCi0gICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5zY20uc3ZuX3JldmlzaW9uX2Zyb21fY29tbWl0X3Rl eHQoY29tbWl0X3RleHQpLCAnMCcpCi0KICAgICBkZWYgdGVzdF9jb21taXRfd2l0aF9tZXNzYWdl X3dvcmtpbmdfY29weV9vbmx5KHNlbGYpOgogICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0 aCgndGVzdF9maWxlX2NvbW1pdDEnLCAnbW9yZSB0ZXN0IGNvbnRlbnQnKQogICAgICAgICBydW5f Y29tbWFuZChbJ2dpdCcsICdhZGQnLCAndGVzdF9maWxlX2NvbW1pdDEnXSkKSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQkocmV2 aXNpb24gMTA0OTcyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtMzMzLDEyICszMzMsNiBAQCBjbGFzcyBTVk4o U0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgaWYgY2hhbmdlZF9maWxlczoKICAgICAgICAg ICAgIHN2bl9jb21taXRfYXJncy5leHRlbmQoY2hhbmdlZF9maWxlcykKIAotICAgICAgICBpZiBz ZWxmLmRyeXJ1bjoKLSAgICAgICAgICAgIF9sb2cuZGVidWcoJ1dvdWxkIHJ1biBTVk4gY29tbWFu ZDogIicgKyAiICIuam9pbihzdm5fY29tbWl0X2FyZ3MpICsgJyInKQotCi0gICAgICAgICAgICAj IFJldHVybiBhIHN0cmluZyB3aGljaCBsb29rcyBsaWtlIGEgY29tbWl0IHNvIHRoYXQgdGhpbmdz IHdoaWNoIHBhcnNlIHRoaXMgb3V0cHV0IHdpbGwgc3VjY2VlZC4KLSAgICAgICAgICAgIHJldHVy biAiRHJ5IHJ1biwgbm8gY29tbWl0LlxuQ29tbWl0dGVkIHJldmlzaW9uIDAuIgotCiAgICAgICAg IHJldHVybiBzZWxmLl9ydW5fc3ZuKHN2bl9jb21taXRfYXJncywgY3dkPXNlbGYuY2hlY2tvdXRf cm9vdCwgZXJyb3JfaGFuZGxlcj1jb21taXRfZXJyb3JfaGFuZGxlcikKIAogICAgIGRlZiBzdm5f Y29tbWl0X2xvZyhzZWxmLCBzdm5fcmV2aXNpb24pOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQkocmV2aXNp b24gMTA0OTcyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxh L2J1Z3ppbGxhLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNTksMTYgKzI1OSwxMyBAQCBjbGFzcyBC dWd6aWxsYVF1ZXJpZXMob2JqZWN0KToKIAogCiBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgotICAg IGRlZiBfX2luaXRfXyhzZWxmLCBkcnlydW49RmFsc2UsIGNvbW1pdHRlcnM9Y29tbWl0dGVycy5D b21taXR0ZXJMaXN0KCkpOgotICAgICAgICBzZWxmLmRyeXJ1biA9IGRyeXJ1bgorICAgIGRlZiBf X2luaXRfXyhzZWxmLCBjb21taXR0ZXJzPWNvbW1pdHRlcnMuQ29tbWl0dGVyTGlzdCgpKToKICAg ICAgICAgc2VsZi5hdXRoZW50aWNhdGVkID0gRmFsc2UKICAgICAgICAgc2VsZi5xdWVyaWVzID0g QnVnemlsbGFRdWVyaWVzKHNlbGYpCiAgICAgICAgIHNlbGYuY29tbWl0dGVycyA9IGNvbW1pdHRl cnMKICAgICAgICAgc2VsZi5jYWNoZWRfcXVpcHMgPSBbXQogICAgICAgICBzZWxmLmVkaXRfdXNl cl9wYXJzZXIgPSBFZGl0VXNlcnNQYXJzZXIoKQogCi0gICAgICAgICMgRklYTUU6IFdlIHNob3Vs ZCB1c2Ugc29tZSBzb3J0IG9mIEJyb3dzZXIgbW9jayBvYmplY3Qgd2hlbiBpbiBkcnlydW4KLSAg ICAgICAgIyBtb2RlICh0byBwcmV2ZW50IGFueSBtaXN0YWtlcykuCiAgICAgICAgIGZyb20gd2Vi a2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLm1lY2hhbml6ZSBpbXBvcnQgQnJvd3Nlcgog ICAgICAgICBzZWxmLmJyb3dzZXIgPSBCcm93c2VyKCkKICAgICAgICAgIyBJZ25vcmUgYnVncy53 ZWJraXQub3JnL3JvYm90cy50eHQgdW50aWwgd2UgZml4IGl0IHRvIGFsbG93IHRoaXMgc2NyaXB0 LgpAQCAtMjkxLDcgKzI4OCw3IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgZGVmIHF1 aXBzKHNlbGYpOgogICAgICAgICAjIFdlIG9ubHkgZmV0Y2ggYW5kIHBhcnNlIHRoZSBsaXN0IG9m IHF1aXBzIG9uY2UgcGVyIGluc3RhbnRpYXRpb24KICAgICAgICAgIyBzbyB0aGF0IHdlIGRvIG5v dCBidXJkZW4gYnVncy53ZWJraXQub3JnLgotICAgICAgICBpZiBub3Qgc2VsZi5jYWNoZWRfcXVp cHMgYW5kIG5vdCBzZWxmLmRyeXJ1bjoKKyAgICAgICAgaWYgbm90IHNlbGYuY2FjaGVkX3F1aXBz OgogICAgICAgICAgICAgc2VsZi5jYWNoZWRfcXVpcHMgPSBzZWxmLnF1ZXJpZXMuZmV0Y2hfcXVp cHMoKQogICAgICAgICByZXR1cm4gc2VsZi5jYWNoZWRfcXVpcHMKIApAQCAtNDc1LDExICs0NzIs NiBAQCBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgogICAgICAgICBpZiBzZWxmLmF1dGhlbnRpY2F0 ZWQ6CiAgICAgICAgICAgICByZXR1cm4KIAotICAgICAgICBpZiBzZWxmLmRyeXJ1bjoKLSAgICAg ICAgICAgIGxvZygiU2tpcHBpbmcgbG9nIGluIGZvciBkcnkgcnVuLi4uIikKLSAgICAgICAgICAg IHNlbGYuYXV0aGVudGljYXRlZCA9IFRydWUKLSAgICAgICAgICAgIHJldHVybgotCiAgICAgICAg IGNyZWRlbnRpYWxzID0gQ3JlZGVudGlhbHMoY29uZmlnX3VybHMuYnVnX3NlcnZlcl9ob3N0LCBn aXRfcHJlZml4PSJidWd6aWxsYSIpCiAKICAgICAgICAgYXR0ZW1wdHMgPSAwCkBAIC01NjMsMTAg KzU1NSw2IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb21tZW50X3RleHQ9Tm9uZSk6CiAgICAgICAgIHNlbGYuYXV0aGVudGljYXRlKCkK ICAgICAgICAgbG9nKCdBZGRpbmcgYXR0YWNobWVudCAiJXMiIHRvICVzJyAlIChkZXNjcmlwdGlv biwgc2VsZi5idWdfdXJsX2Zvcl9idWdfaWQoYnVnX2lkKSkpCi0gICAgICAgIGlmIHNlbGYuZHJ5 cnVuOgotICAgICAgICAgICAgbG9nKGNvbW1lbnRfdGV4dCkKLSAgICAgICAgICAgIHJldHVybgot CiAgICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKHNlbGYuYWRkX2F0dGFjaG1lbnRfdXJsKGJ1Z19p ZCkpCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9ybShuYW1lPSJlbnRyeWZvcm0iKQog ICAgICAgICBmaWxlX29iamVjdCA9IHNlbGYuX2ZpbGVfb2JqZWN0X2Zvcl91cGxvYWQoZmlsZV9v cl9zdHJpbmcpCkBAIC01OTAsMTAgKzU3OCw2IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAg ICAgICAgIHNlbGYuYXV0aGVudGljYXRlKCkKICAgICAgICAgbG9nKCdBZGRpbmcgcGF0Y2ggIiVz IiB0byAlcycgJSAoZGVzY3JpcHRpb24sIHNlbGYuYnVnX3VybF9mb3JfYnVnX2lkKGJ1Z19pZCkp KQogCi0gICAgICAgIGlmIHNlbGYuZHJ5cnVuOgotICAgICAgICAgICAgbG9nKGNvbW1lbnRfdGV4 dCkKLSAgICAgICAgICAgIHJldHVybgotCiAgICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKHNlbGYu YWRkX2F0dGFjaG1lbnRfdXJsKGJ1Z19pZCkpCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3Rf Zm9ybShuYW1lPSJlbnRyeWZvcm0iKQogICAgICAgICBmaWxlX29iamVjdCA9IHNlbGYuX2ZpbGVf b2JqZWN0X2Zvcl91cGxvYWQoZmlsZV9vcl9zdHJpbmcpCkBAIC02NDQsMTEgKzYyOCw2IEBAIGNs YXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgICAgIHNlbGYuYXV0aGVudGljYXRlKCkKIAogICAg ICAgICBsb2coJ0NyZWF0aW5nIGJ1ZyB3aXRoIHRpdGxlICIlcyInICUgYnVnX3RpdGxlKQotICAg ICAgICBpZiBzZWxmLmRyeXJ1bjoKLSAgICAgICAgICAgIGxvZyhidWdfZGVzY3JpcHRpb24pCi0g ICAgICAgICAgICAjIEZJWE1FOiBUaGlzIHdpbGwgbWFrZSBzb21lIHBhdGhzIGZhaWwsIGFzIHRo ZXkgYXNzdW1lIHRoaXMgcmV0dXJucyBhbiBpZC4KLSAgICAgICAgICAgIHJldHVybgotCiAgICAg ICAgIHNlbGYuYnJvd3Nlci5vcGVuKGNvbmZpZ191cmxzLmJ1Z19zZXJ2ZXJfdXJsICsgImVudGVy X2J1Zy5jZ2k/cHJvZHVjdD1XZWJLaXQiKQogICAgICAgICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zv cm0obmFtZT0iQ3JlYXRlIikKICAgICAgICAgY29tcG9uZW50X2l0ZW1zID0gc2VsZi5icm93c2Vy LmZpbmRfY29udHJvbCgnY29tcG9uZW50JykuaXRlbXMKQEAgLTcwNiw5ICs2ODUsNiBAQCBjbGFz cyBCdWd6aWxsYShvYmplY3QpOgogICAgICAgICAgICAgY29tbWVudF90ZXh0ICs9ICJcblxuJXMi ICUgYWRkaXRpb25hbF9jb21tZW50X3RleHQKICAgICAgICAgbG9nKGNvbW1lbnRfdGV4dCkKIAot ICAgICAgICBpZiBzZWxmLmRyeXJ1bjoKLSAgICAgICAgICAgIHJldHVybgotCiAgICAgICAgIHNl bGYuYnJvd3Nlci5vcGVuKHNlbGYuYXR0YWNobWVudF91cmxfZm9yX2lkKGF0dGFjaG1lbnRfaWQs ICdlZGl0JykpCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9ybShucj0xKQogICAgICAg ICBzZWxmLmJyb3dzZXIuc2V0X3ZhbHVlKGNvbW1lbnRfdGV4dCwgbmFtZT0nY29tbWVudCcsIG5y PTApCkBAIC03MzIsOSArNzA4LDYgQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0KToKICAgICAgICAg ICAgIGNvbW1lbnRfdGV4dCArPSAiXG5cbiVzIiAlIGFkZGl0aW9uYWxfY29tbWVudF90ZXh0CiAg ICAgICAgIGxvZyhjb21tZW50X3RleHQpCiAKLSAgICAgICAgaWYgc2VsZi5kcnlydW46Ci0gICAg ICAgICAgICByZXR1cm4KLQogICAgICAgICBzZWxmLmJyb3dzZXIub3BlbihzZWxmLmF0dGFjaG1l bnRfdXJsX2Zvcl9pZChhdHRhY2htZW50X2lkLCAnZWRpdCcpKQogICAgICAgICBzZWxmLmJyb3dz ZXIuc2VsZWN0X2Zvcm0obnI9MSkKIApAQCAtNzUxLDEwICs3MjQsNiBAQCBjbGFzcyBCdWd6aWxs YShvYmplY3QpOgogICAgICAgICBzZWxmLmF1dGhlbnRpY2F0ZSgpCiAKICAgICAgICAgbG9nKCJP YnNvbGV0aW5nIGF0dGFjaG1lbnQ6ICVzIiAlIGF0dGFjaG1lbnRfaWQpCi0gICAgICAgIGlmIHNl bGYuZHJ5cnVuOgotICAgICAgICAgICAgbG9nKGNvbW1lbnRfdGV4dCkKLSAgICAgICAgICAgIHJl dHVybgotCiAgICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKHNlbGYuYXR0YWNobWVudF91cmxfZm9y X2lkKGF0dGFjaG1lbnRfaWQsICdlZGl0JykpCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3Rf Zm9ybShucj0xKQogICAgICAgICBzZWxmLmJyb3dzZXIuZmluZF9jb250cm9sKCdpc29ic29sZXRl JykuaXRlbXNbMF0uc2VsZWN0ZWQgPSBUcnVlCkBAIC03NzIsOSArNzQxLDYgQEAgY2xhc3MgQnVn emlsbGEob2JqZWN0KToKICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGUoKQogCiAgICAgICAgIGxv ZygiQWRkaW5nICVzIHRvIHRoZSBDQyBsaXN0IGZvciBidWcgJXMiICUgKGVtYWlsX2FkZHJlc3Nf bGlzdCwgYnVnX2lkKSkKLSAgICAgICAgaWYgc2VsZi5kcnlydW46Ci0gICAgICAgICAgICByZXR1 cm4KLQogICAgICAgICBzZWxmLmJyb3dzZXIub3BlbihzZWxmLmJ1Z191cmxfZm9yX2J1Z19pZChi dWdfaWQpKQogICAgICAgICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zvcm0obmFtZT0iY2hhbmdlZm9y bSIpCiAgICAgICAgIHNlbGYuYnJvd3NlclsibmV3Y2MiXSA9ICIsICIuam9pbihlbWFpbF9hZGRy ZXNzX2xpc3QpCkBAIC03ODQsMTAgKzc1MCw2IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAg ICAgICAgIHNlbGYuYXV0aGVudGljYXRlKCkKIAogICAgICAgICBsb2coIkFkZGluZyBjb21tZW50 IHRvIGJ1ZyAlcyIgJSBidWdfaWQpCi0gICAgICAgIGlmIHNlbGYuZHJ5cnVuOgotICAgICAgICAg ICAgbG9nKGNvbW1lbnRfdGV4dCkKLSAgICAgICAgICAgIHJldHVybgotCiAgICAgICAgIHNlbGYu YnJvd3Nlci5vcGVuKHNlbGYuYnVnX3VybF9mb3JfYnVnX2lkKGJ1Z19pZCkpCiAgICAgICAgIHNl bGYuYnJvd3Nlci5zZWxlY3RfZm9ybShuYW1lPSJjaGFuZ2Vmb3JtIikKICAgICAgICAgc2VsZi5i cm93c2VyWyJjb21tZW50Il0gPSBjb21tZW50X3RleHQKQEAgLTc5OSwxMCArNzYxLDYgQEAgY2xh c3MgQnVnemlsbGEob2JqZWN0KToKICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGUoKQogCiAgICAg ICAgIGxvZygiQ2xvc2luZyBidWcgJXMgYXMgZml4ZWQiICUgYnVnX2lkKQotICAgICAgICBpZiBz ZWxmLmRyeXJ1bjoKLSAgICAgICAgICAgIGxvZyhjb21tZW50X3RleHQpCi0gICAgICAgICAgICBy ZXR1cm4KLQogICAgICAgICBzZWxmLmJyb3dzZXIub3BlbihzZWxmLmJ1Z191cmxfZm9yX2J1Z19p ZChidWdfaWQpKQogICAgICAgICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zvcm0obmFtZT0iY2hhbmdl Zm9ybSIpCiAgICAgICAgIGlmIGNvbW1lbnRfdGV4dDoKQEAgLTgyMSwxMCArNzc5LDYgQEAgY2xh c3MgQnVnemlsbGEob2JqZWN0KToKICAgICAgICAgICAgIGFzc2lnbmVlID0gc2VsZi51c2VybmFt ZQogCiAgICAgICAgIGxvZygiQXNzaWduaW5nIGJ1ZyAlcyB0byAlcyIgJSAoYnVnX2lkLCBhc3Np Z25lZSkpCi0gICAgICAgIGlmIHNlbGYuZHJ5cnVuOgotICAgICAgICAgICAgbG9nKGNvbW1lbnRf dGV4dCkKLSAgICAgICAgICAgIHJldHVybgotCiAgICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKHNl bGYuYnVnX3VybF9mb3JfYnVnX2lkKGJ1Z19pZCkpCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxl Y3RfZm9ybShuYW1lPSJjaGFuZ2Vmb3JtIikKIApAQCAtODUwLDkgKzgwNCw2IEBAIGZvciBzb21l b25lIHRvIGFkZCBFZGl0QnVncyB0byB5b3VyIGJ1Z3MKICAgICAgICAgIyBCdWd6aWxsYSByZXF1 aXJlcyBhIGNvbW1lbnQgd2hlbiByZS1vcGVuaW5nIGEgYnVnLCBzbyB3ZSBrbm93IGl0IHdpbGwK ICAgICAgICAgIyBuZXZlciBiZSBOb25lLgogICAgICAgICBsb2coY29tbWVudF90ZXh0KQotICAg ICAgICBpZiBzZWxmLmRyeXJ1bjoKLSAgICAgICAgICAgIHJldHVybgotCiAgICAgICAgIHNlbGYu YnJvd3Nlci5vcGVuKHNlbGYuYnVnX3VybF9mb3JfYnVnX2lkKGJ1Z19pZCkpCiAgICAgICAgIHNl bGYuYnJvd3Nlci5zZWxlY3RfZm9ybShuYW1lPSJjaGFuZ2Vmb3JtIikKICAgICAgICAgYnVnX3N0 YXR1cyA9IHNlbGYuYnJvd3Nlci5maW5kX2NvbnRyb2woImJ1Z19zdGF0dXMiLCB0eXBlPSJzZWxl Y3QiKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkJKHJldmlzaW9uIDEwNDk3 MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CSh3b3JraW5nIGNvcHkp CkBAIC01Myw4ICs1Myw2IEBAIGNsYXNzIFRlc3RlcihvYmplY3QpOgogICAgICAgICBwYXJzZXIg PSBvcHRwYXJzZS5PcHRpb25QYXJzZXIodXNhZ2U9J3VzYWdlOiAlcHJvZyBbb3B0aW9uc10gW21v ZHVsZXMuLi5dJykKICAgICAgICAgcGFyc2VyLmFkZF9vcHRpb24oJy1hJywgJy0tYWxsJywgYWN0 aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgaGVscD0ncnVuIGFsbCB0aGUgdGVzdHMnKSwKLSAgICAgICAgcGFyc2VyLmFkZF9vcHRpb24o Jy1uJywgJy0tZHJ5cnVuJywgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0nZG8gbm90IGFjdHVhbGx5IHJ1biB0aGUgdGVz dHMnKSwKICAgICAgICAgcGFyc2VyLmFkZF9vcHRpb24oJy1xJywgJy0tcXVpZXQnLCBhY3Rpb249 J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICBo ZWxwPSdydW4gcXVpZXRseSAoZXJyb3JzLCB3YXJuaW5ncywgYW5kIHByb2dyZXNzIG9ubHkpJyks CiAgICAgICAgIHBhcnNlci5hZGRfb3B0aW9uKCctcycsICctLXNpbGVudCcsIGFjdGlvbj0nc3Rv cmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCkBAIC0yMTcsMTAgKzIxNSw2IEBAIGNsYXNzIFRlc3Rl cihvYmplY3QpOgogICAgICAgICByZXR1cm4gbW9kdWxlcwogCiAgICAgZGVmIHJ1bl90ZXN0cyhz ZWxmLCBtb2R1bGVzKToKLSAgICAgICAgIyBGSVhNRTogaW1wbGVtZW50IGEgbW9yZSB1c2VmdWwg ZHJ5cnVuIHRoYXQgcmVjdXJzZXMgaW50byB0aGUgdGVzdCBzdWl0ZS4KLSAgICAgICAgaWYgc2Vs Zi5fb3B0aW9ucy5kcnlydW46Ci0gICAgICAgICAgICByZXR1cm4gVHJ1ZQotCiAgICAgICAgICMg dW5pdHRlc3QgaGFzIGhvcnJpYmxlIGVycm9yIHJlcG9ydGluZyB3aGVuIG1vZHVsZSBpbXBvcnRz IGFyZSBiYWQKICAgICAgICAgIyBzbyB3ZSBpbXBvcnRzIHRoZW0gZmlyc3QgdG8gbWFrZSBkZWJ1 Z2dpbmcgYmFkIGltcG9ydHMgbXVjaCBlYXNpZXIuCiAgICAgICAgIF9sb2cuZGVidWcoIkltcG9y dGluZyBhbGwgdGhlIG1vZHVsZXMgdG8gY2hlY2sgZm9yIGVycm9ycy4iKQpJbmRleDogVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL21haW4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL21haW4ucHkJKHJldmlzaW9uIDEwNDk3MikKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9tYWluLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00NSw3ICs0NSw2IEBA IGNsYXNzIFdlYktpdFBhdGNoKE11bHRpQ29tbWFuZFRvb2wsIEhvc3QKICAgICBnbG9iYWxfb3B0 aW9ucyA9IFsKICAgICAgICAgbWFrZV9vcHRpb24oIi12IiwgIi0tdmVyYm9zZSIsIGFjdGlvbj0i c3RvcmVfdHJ1ZSIsIGRlc3Q9InZlcmJvc2UiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJlbmFibGUg YWxsIGxvZ2dpbmciKSwKICAgICAgICAgbWFrZV9vcHRpb24oIi1kIiwgIi0tZGlyZWN0b3J5Iiwg YWN0aW9uPSJhcHBlbmQiLCBkZXN0PSJwYXRjaF9kaXJlY3RvcmllcyIsIGRlZmF1bHQ9W10sIGhl bHA9IkRpcmVjdG9yeSB0byBsb29rIGF0IGZvciBjaGFuZ2VkIGZpbGVzIiksCi0gICAgICAgIG1h a2Vfb3B0aW9uKCItLWRyeS1ydW4iLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0PSJkcnlfcnVu IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iZG8gbm90IHRvdWNoIHJlbW90ZSBzZXJ2ZXJzIiksCiAg ICAgICAgIG1ha2Vfb3B0aW9uKCItLXN0YXR1cy1ob3N0IiwgYWN0aW9uPSJzdG9yZSIsIGRlc3Q9 InN0YXR1c19ob3N0IiwgdHlwZT0ic3RyaW5nIiwgaGVscD0iSG9zdG5hbWUgKGUuZy4gbG9jYWxo b3N0IG9yIGNvbW1pdC53ZWJraXQub3JnKSB3aGVyZSBzdGF0dXMgdXBkYXRlcyBzaG91bGQgYmUg cG9zdGVkLiIpLAogICAgICAgICBtYWtlX29wdGlvbigiLS1ib3QtaWQiLCBhY3Rpb249InN0b3Jl IiwgZGVzdD0iYm90X2lkIiwgdHlwZT0ic3RyaW5nIiwgaGVscD0iSWRlbnRpZmllciBmb3IgdGhp cyBib3QgKGlmIG11bHRpcGxlIGJvdHMgYXJlIHJ1bm5pbmcgZm9yIGEgcXVldWUpIiksCiAgICAg ICAgIG1ha2Vfb3B0aW9uKCItLWlyYy1wYXNzd29yZCIsIGFjdGlvbj0ic3RvcmUiLCBkZXN0PSJp cmNfcGFzc3dvcmQiLCB0eXBlPSJzdHJpbmciLCBoZWxwPSJQYXNzd29yZCB0byB1c2Ugd2hlbiBj b21tdW5pY2F0aW5nIHZpYSBJUkMuIiksCkBAIC05Miw5ICs5MSw2IEBAIGNsYXNzIFdlYktpdFBh dGNoKE11bHRpQ29tbWFuZFRvb2wsIEhvc3QKICAgICAjIEZJWE1FOiBUaGlzIG1heSBiZSB1bm5l Y2Vzc2FyeSBzaW5jZSB3ZSBwYXNzIGdsb2JhbCBvcHRpb25zIHRvIGFsbCBjb21tYW5kcyBkdXJp bmcgZXhlY3V0ZSgpIGFzIHdlbGwuCiAgICAgZGVmIGhhbmRsZV9nbG9iYWxfb3B0aW9ucyhzZWxm LCBvcHRpb25zKToKICAgICAgICAgc2VsZi5faW5pdGlhbGl6ZV9zY20ob3B0aW9ucy5wYXRjaF9k aXJlY3RvcmllcykKLSAgICAgICAgaWYgb3B0aW9ucy5kcnlfcnVuOgotICAgICAgICAgICAgc2Vs Zi5zY20oKS5kcnlydW4gPSBUcnVlCi0gICAgICAgICAgICBzZWxmLmJ1Z3MuZHJ5cnVuID0gVHJ1 ZQogICAgICAgICBpZiBvcHRpb25zLnN0YXR1c19ob3N0OgogICAgICAgICAgICAgc2VsZi5zdGF0 dXNfc2VydmVyLnNldF9ob3N0KG9wdGlvbnMuc3RhdHVzX2hvc3QpCiAgICAgICAgIGlmIG9wdGlv bnMuYm90X2lkOgo=