64185 2011-07-08 11:15:39 -0700 garden-o-matic should be able to roll out patches 2011-07-12 13:20:25 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 64183 1 abarth abarth oldest_to_newest 434173 0 abarth 2011-07-08 11:15:39 -0700 We already have a bunch of infrastructure for rolling out patches. The local server can either use the local working copy or ask one of the bots to perform the rollout. 434531 1 100218 abarth 2011-07-09 14:35:09 -0700 Created attachment 100218 work in progress 434555 2 100225 abarth 2011-07-10 07:59:27 -0700 Created attachment 100225 work in progress 434560 3 100226 abarth 2011-07-10 08:45:23 -0700 Created attachment 100226 Patch 434607 4 100226 eric 2011-07-10 12:26:50 -0700 Comment on attachment 100226 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100226&action=review I'm not sure I believe in this config object, and I think tool should be held separate. But the change looks good. > Tools/Scripts/webkitpy/tool/commands/gardenomatic.py:38 > + def _prepare_config(self, options, args, tool): > + return { > + 'tool': tool, > + } Odd. I would think we would pass a tool around anyway as its own argument. > Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:47 > + def __init__(self, server): > + self.server = server pylint is going to get mad that we don't call the original __init__. YOu shoudl call the original __init__ with mocks from this one. > Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:58 > + def test_empty_state(self): > + expected_stderr = "MOCK run_command: ['echo', 'rollout', '--force-clean', '--non-interactive', '2314', 'MOCK rollout reason']\n" > + self._post_to_path("/rollout?revision=2314&reason=MOCK+rollout+reason", expected_stderr=expected_stderr) Very slick. 434613 5 100226 abarth 2011-07-10 12:47:58 -0700 Comment on attachment 100226 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100226&action=review >> Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:47 >> +# The real GardeningHTTPRequestHandler has a constructor that's too hard to >> +# call in a unit test, so we create a subclass that's easier to constrcut. >> +class TestGardeningHTTPRequestHandler(GardeningHTTPRequestHandler): >> + def __init__(self, server): >> + self.server = server > > pylint is going to get mad that we don't call the original __init__. YOu shoudl call the original __init__ with mocks from this one. As the comment says, the entire point of this class is to avoid calling the original __init__. 435009 6 100226 abarth 2011-07-11 10:51:07 -0700 Comment on attachment 100226 Patch Clearing flags on attachment: 100226 Committed r90762: <http://trac.webkit.org/changeset/90762> 435010 7 abarth 2011-07-11 10:51:11 -0700 All reviewed patches have been landed. Closing bug. 100218 2011-07-09 14:35:09 -0700 2011-07-10 07:59:23 -0700 work in progress bug-64185-20110709143507.patch text/plain 1981 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2ODgKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9nYXJkZW5vbWF0aWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvZ2FyZGVub21hdGljLnB5CmluZGV4IGIyZjJmYzdiYjgxNTg5ZWVj ZWM3NzY1MTA0MWRkNTBjMzg1Y2ZmNjEuLjEwY2MyODVmNzNmOGM3ZGZjZDQ0NjVkOGI0MDY0NmQw ODQ5YmJjMDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9nYXJkZW5vbWF0aWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL2dhcmRlbm9tYXRpYy5weQpAQCAtMzEsMyArMzEsOCBAQCBjbGFzcyBHYXJkZW5PTWF0aWMo QWJzdHJhY3RMb2NhbFNlcnZlckNvbW1hbmQpOgogICAgIGhlbHBfdGV4dCA9ICJFeHBlcmltZW50 YWwgY29tbWFuZCBmb3IgZ2FyZGVuaW5nIHRoZSBXZWJLaXQgdHJlZS4iCiAKICAgICBzZXJ2ZXIg PSBHYXJkZW5pbmdIVFRQU2VydmVyCisKKyAgICBkZWYgX3ByZXBhcmVfY29uZmlnKHNlbGYsIG9w dGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICByZXR1cm4geworICAgICAgICAgICAgJ3Rvb2wn OiB0b29sLAorICAgICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkKaW5kZXggMDdmZmI3YTEyNTliZTljZmQyMDY4 ZjE0N2Y1OGE4ZTAxM2Q0M2UyMy4uZTA3MzcwMjYzNjY1NzNhNWQxNjIyZjdiZDc5NGQzY2Q2YjZl NTE2YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2Fy ZGVuaW5nc2VydmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJz L2dhcmRlbmluZ3NlcnZlci5weQpAQCAtMzAsNyArMzAsOCBAQCBmcm9tIHdlYmtpdHB5LnRvb2wu c2VydmVycy5yZWZsZWN0aW9uaGFuZGxlciBpbXBvcnQgUmVmbGVjdGlvbkhhbmRsZXIKIAogY2xh c3MgR2FyZGVuaW5nSFRUUFNlcnZlcihCYXNlSFRUUFNlcnZlci5IVFRQU2VydmVyKToKICAgICBk ZWYgX19pbml0X18oc2VsZiwgaHR0cGRfcG9ydCwgY29uZmlnKToKLSAgICAgICAgc2VydmVyX25h bWUgPSAiIgorICAgICAgICBzZXJ2ZXJfbmFtZSA9ICcnCisgICAgICAgIHNlbGYudG9vbCA9IGNv bmZpZ1sndG9vbCddCiAgICAgICAgIEJhc2VIVFRQU2VydmVyLkhUVFBTZXJ2ZXIuX19pbml0X18o c2VsZiwgKHNlcnZlcl9uYW1lLCBodHRwZF9wb3J0KSwgR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5k bGVyKQogCiAKQEAgLTQ3LDMgKzQ4LDE3IEBAIGNsYXNzIEdhcmRlbmluZ0hUVFBSZXF1ZXN0SGFu ZGxlcihSZWZsZWN0aW9uSGFuZGxlcik6CiAgICAgXSkKIAogICAgIFNUQVRJQ19GSUxFX0RJUkVD VE9SWSA9IG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiZGF0YSIsICJn YXJkZW5pbmdzZXJ2ZXIiKQorCisgICAgZGVmIF9ydW5fd2Via2l0X3BhdGNoKHNlbGYsIGFyZ3Mp OgorICAgICAgICByZXR1cm4gc2VsZi5zZXJ2ZXIudG9vbC5leGVjdXRpdmUucnVuX2NvbW1hbmQo W3NlbGYuc2VydmVyLnRvb2wucGF0aCgpXSArIGFyZ3MpOworCisgICAgZGVmIHJvbGxvdXQoc2Vs Zik6CisgICAgICAgIHJldmlzaW9uID0gc2VsZi5xdWVyeVsncmV2aXNpb24nXVswXQorICAgICAg ICByZWFzb24gPSBzZWxmLnF1ZXJ0WydyZWFzb24nXVswXQorICAgICAgICBzZWxmLl9ydW5fd2Vi a2l0X3BhdGNoKFsKKyAgICAgICAgICAgICdyb2xsb3V0JywKKyAgICAgICAgICAgICctLWZvcmNl LWNsZWFuJywKKyAgICAgICAgICAgICctLW5vbi1pbnRlcmFjdGl2ZScsCisgICAgICAgICAgICBy ZXZpc2lvbiwKKyAgICAgICAgICAgIHJlYXNvbiwKKyAgICAgICAgXSk7Cg== 100225 2011-07-10 07:59:27 -0700 2011-07-10 08:45:19 -0700 work in progress bug-64185-20110710075929.patch text/plain 4680 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2ODgKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9nYXJkZW5vbWF0aWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvZ2FyZGVub21hdGljLnB5CmluZGV4IGIyZjJmYzdiYjgxNTg5ZWVj ZWM3NzY1MTA0MWRkNTBjMzg1Y2ZmNjEuLjEwY2MyODVmNzNmOGM3ZGZjZDQ0NjVkOGI0MDY0NmQw ODQ5YmJjMDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9nYXJkZW5vbWF0aWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL2dhcmRlbm9tYXRpYy5weQpAQCAtMzEsMyArMzEsOCBAQCBjbGFzcyBHYXJkZW5PTWF0aWMo QWJzdHJhY3RMb2NhbFNlcnZlckNvbW1hbmQpOgogICAgIGhlbHBfdGV4dCA9ICJFeHBlcmltZW50 YWwgY29tbWFuZCBmb3IgZ2FyZGVuaW5nIHRoZSBXZWJLaXQgdHJlZS4iCiAKICAgICBzZXJ2ZXIg PSBHYXJkZW5pbmdIVFRQU2VydmVyCisKKyAgICBkZWYgX3ByZXBhcmVfY29uZmlnKHNlbGYsIG9w dGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICByZXR1cm4geworICAgICAgICAgICAgJ3Rvb2wn OiB0b29sLAorICAgICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkKaW5kZXggMDdmZmI3YTEyNTliZTljZmQyMDY4 ZjE0N2Y1OGE4ZTAxM2Q0M2UyMy4uZTA3MzcwMjYzNjY1NzNhNWQxNjIyZjdiZDc5NGQzY2Q2YjZl NTE2YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2Fy ZGVuaW5nc2VydmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJz L2dhcmRlbmluZ3NlcnZlci5weQpAQCAtMzAsNyArMzAsOCBAQCBmcm9tIHdlYmtpdHB5LnRvb2wu c2VydmVycy5yZWZsZWN0aW9uaGFuZGxlciBpbXBvcnQgUmVmbGVjdGlvbkhhbmRsZXIKIAogY2xh c3MgR2FyZGVuaW5nSFRUUFNlcnZlcihCYXNlSFRUUFNlcnZlci5IVFRQU2VydmVyKToKICAgICBk ZWYgX19pbml0X18oc2VsZiwgaHR0cGRfcG9ydCwgY29uZmlnKToKLSAgICAgICAgc2VydmVyX25h bWUgPSAiIgorICAgICAgICBzZXJ2ZXJfbmFtZSA9ICcnCisgICAgICAgIHNlbGYudG9vbCA9IGNv bmZpZ1sndG9vbCddCiAgICAgICAgIEJhc2VIVFRQU2VydmVyLkhUVFBTZXJ2ZXIuX19pbml0X18o c2VsZiwgKHNlcnZlcl9uYW1lLCBodHRwZF9wb3J0KSwgR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5k bGVyKQogCiAKQEAgLTQ3LDMgKzQ4LDE3IEBAIGNsYXNzIEdhcmRlbmluZ0hUVFBSZXF1ZXN0SGFu ZGxlcihSZWZsZWN0aW9uSGFuZGxlcik6CiAgICAgXSkKIAogICAgIFNUQVRJQ19GSUxFX0RJUkVD VE9SWSA9IG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiZGF0YSIsICJn YXJkZW5pbmdzZXJ2ZXIiKQorCisgICAgZGVmIF9ydW5fd2Via2l0X3BhdGNoKHNlbGYsIGFyZ3Mp OgorICAgICAgICByZXR1cm4gc2VsZi5zZXJ2ZXIudG9vbC5leGVjdXRpdmUucnVuX2NvbW1hbmQo W3NlbGYuc2VydmVyLnRvb2wucGF0aCgpXSArIGFyZ3MpOworCisgICAgZGVmIHJvbGxvdXQoc2Vs Zik6CisgICAgICAgIHJldmlzaW9uID0gc2VsZi5xdWVyeVsncmV2aXNpb24nXVswXQorICAgICAg ICByZWFzb24gPSBzZWxmLnF1ZXJ0WydyZWFzb24nXVswXQorICAgICAgICBzZWxmLl9ydW5fd2Vi a2l0X3BhdGNoKFsKKyAgICAgICAgICAgICdyb2xsb3V0JywKKyAgICAgICAgICAgICctLWZvcmNl LWNsZWFuJywKKyAgICAgICAgICAgICctLW5vbi1pbnRlcmFjdGl2ZScsCisgICAgICAgICAgICBy ZXZpc2lvbiwKKyAgICAgICAgICAgIHJlYXNvbiwKKyAgICAgICAgXSk7CmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXJfdW5pdHRl c3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2 ZXJfdW5pdHRlc3QucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2VjNjRjNmViMTFmNzVkOTZkYzA0Yjk5NmU3Njg1 MWUyM2M4MTAxZQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlcl91bml0dGVzdC5weQpAQCAtMCwwICsxLDUxIEBACisj IENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIwor IyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICogUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyLgorIyAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMg ICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRz CisjIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVj dHMgZGVyaXZlZCBmcm9tCisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3 cml0dGVuIHBlcm1pc3Npb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhF IENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5ZIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRF RCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVNUExB UlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1Mg T0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMg T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKworaW1wb3J0IHVuaXR0ZXN0CisKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5vdXRwdXRjYXB0dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCitmcm9tIHdlYmtpdHB5LnRo aXJkcGFydHkubW9jayBpbXBvcnQgTW9jaworZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGlt cG9ydCBNb2NrVG9vbCwgTW9ja0V4ZWN1dGl2ZQorZnJvbSB3ZWJraXRweS50b29sLnNlcnZlcnMu Z2FyZGVuaW5nc2VydmVyIGltcG9ydCAqCisKKworY2xhc3MgTW9ja1NlcnZlcihvYmplY3QpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKKyAgICAg ICAgdG9vbC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlKHNob3VsZF9sb2c9VHJ1ZSkKKworCitj bGFzcyBHYXJkZW5pbmdTZXJ2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgdGVz dF9lbXB0eV9zdGF0ZShzZWxmKToKKyAgICAgICAgaGFuZGxlciA9IEdhcmRlbmluZ0hUVFBSZXF1 ZXN0SGFuZGxlcihNb2NrKCksIE1vY2soKSwgTW9ja1NlcnZlcigpKQorICAgICAgICBleHBlY3Rl ZF9zdGRlcnIgPSAieHh4IgorICAgICAgICBoYW5kbGVyLnF1ZXJ5ID0geworICAgICAgICAgICAg InJldmlzaW9uIjogWyIyMzE0Il0sCisgICAgICAgICAgICAicmVhc29uIjogWyJNT0NLIHJvbGxv dXQgcmVhc29uIl0sCisgICAgICAgIH0KKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9v dXRwdXRzKHNlbGYsIGhhbmRsZXIucm9sbG91dCwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0 ZGVycikK 100226 2011-07-10 08:45:23 -0700 2011-07-11 10:51:06 -0700 Patch bug-64185-20110710084521.patch text/plain 6076 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2OTAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzYjM2NDAxMDlmN2YzYjgzYzQ0ZjcyODQ2NjE4YTg0NDU2 NWJhNmU2Li4yYTk1YmNhOTkwZjA4NjY0M2EzODNiYmNiODkwYmU2NGQ0YmY3YmU3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTEtMDctMTAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAg ICBnYXJkZW4tby1tYXRpYyBzaG91bGQgYmUgYWJsZSB0byByb2xsIG91dCBwYXRjaGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDE4NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgZ2FyZGVuaW5n IHNlcnZlciBBUEkgaXMgc2ltcGx5IGEgYmluZGluZyB0byB0aGUgcm9sbG91dCBtYWNoaW5lcnkK KyAgICAgICAgYWxyZWFkeSBwcmVzZW50IGluIHdlYmtpdC1wYXRjaC4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9nYXJkZW5vbWF0aWMucHk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlcl91bml0dGVz dC5weTogQWRkZWQuCisKKzIwMTEtMDctMTAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKwogICAgICAgICBnYXJkZW4tby1tYXRpYyBzaG91bGQgYmUgYWJsZSB0byBkZXRlcm1pbmUg d2hpY2ggcmV2aXNpb25zIGNhdXNlZCBhIGdpdmVuIGZhaWx1cmUKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MTg5CiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9nYXJkZW5vbWF0aWMucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZ2FyZGVub21hdGljLnB5CmluZGV4IGIyZjJm YzdiYjgxNTg5ZWVjZWM3NzY1MTA0MWRkNTBjMzg1Y2ZmNjEuLjEwY2MyODVmNzNmOGM3ZGZjZDQ0 NjVkOGI0MDY0NmQwODQ5YmJjMDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9nYXJkZW5vbWF0aWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL2dhcmRlbm9tYXRpYy5weQpAQCAtMzEsMyArMzEsOCBAQCBjbGFzcyBH YXJkZW5PTWF0aWMoQWJzdHJhY3RMb2NhbFNlcnZlckNvbW1hbmQpOgogICAgIGhlbHBfdGV4dCA9 ICJFeHBlcmltZW50YWwgY29tbWFuZCBmb3IgZ2FyZGVuaW5nIHRoZSBXZWJLaXQgdHJlZS4iCiAK ICAgICBzZXJ2ZXIgPSBHYXJkZW5pbmdIVFRQU2VydmVyCisKKyAgICBkZWYgX3ByZXBhcmVfY29u ZmlnKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICByZXR1cm4geworICAgICAg ICAgICAgJ3Rvb2wnOiB0b29sLAorICAgICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkKaW5kZXggMDdmZmI3YTEy NTliZTljZmQyMDY4ZjE0N2Y1OGE4ZTAxM2Q0M2UyMy4uZmY5NmVkYmZlZDNkZTYxZTI2ZTJjZWQz ZmJjMzQ1NWE2NzE1ZTdhNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlci5weQpAQCAtMzAsNyArMzAsOCBAQCBmcm9tIHdl YmtpdHB5LnRvb2wuc2VydmVycy5yZWZsZWN0aW9uaGFuZGxlciBpbXBvcnQgUmVmbGVjdGlvbkhh bmRsZXIKIAogY2xhc3MgR2FyZGVuaW5nSFRUUFNlcnZlcihCYXNlSFRUUFNlcnZlci5IVFRQU2Vy dmVyKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgaHR0cGRfcG9ydCwgY29uZmlnKToKLSAgICAg ICAgc2VydmVyX25hbWUgPSAiIgorICAgICAgICBzZXJ2ZXJfbmFtZSA9ICcnCisgICAgICAgIHNl bGYudG9vbCA9IGNvbmZpZ1sndG9vbCddCiAgICAgICAgIEJhc2VIVFRQU2VydmVyLkhUVFBTZXJ2 ZXIuX19pbml0X18oc2VsZiwgKHNlcnZlcl9uYW1lLCBodHRwZF9wb3J0KSwgR2FyZGVuaW5nSFRU UFJlcXVlc3RIYW5kbGVyKQogCiAKQEAgLTQ3LDMgKzQ4LDE3IEBAIGNsYXNzIEdhcmRlbmluZ0hU VFBSZXF1ZXN0SGFuZGxlcihSZWZsZWN0aW9uSGFuZGxlcik6CiAgICAgXSkKIAogICAgIFNUQVRJ Q19GSUxFX0RJUkVDVE9SWSA9IG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18p LCAiZGF0YSIsICJnYXJkZW5pbmdzZXJ2ZXIiKQorCisgICAgZGVmIF9ydW5fd2Via2l0X3BhdGNo KHNlbGYsIGFyZ3MpOgorICAgICAgICByZXR1cm4gc2VsZi5zZXJ2ZXIudG9vbC5leGVjdXRpdmUu cnVuX2NvbW1hbmQoW3NlbGYuc2VydmVyLnRvb2wucGF0aCgpXSArIGFyZ3MpCisKKyAgICBkZWYg cm9sbG91dChzZWxmKToKKyAgICAgICAgcmV2aXNpb24gPSBzZWxmLnF1ZXJ5WydyZXZpc2lvbidd WzBdCisgICAgICAgIHJlYXNvbiA9IHNlbGYucXVlcnlbJ3JlYXNvbiddWzBdCisgICAgICAgIHNl bGYuX3J1bl93ZWJraXRfcGF0Y2goWworICAgICAgICAgICAgJ3JvbGxvdXQnLAorICAgICAgICAg ICAgJy0tZm9yY2UtY2xlYW4nLAorICAgICAgICAgICAgJy0tbm9uLWludGVyYWN0aXZlJywKKyAg ICAgICAgICAgIHJldmlzaW9uLAorICAgICAgICAgICAgcmVhc29uLAorICAgICAgICBdKQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2Vy dmVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2Fy ZGVuaW5nc2VydmVyX3VuaXR0ZXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdiMTJmNzU2NjUxZjY0ODEyZWM3 MjUwNDJhOThkNTVhNmRkYWVhNGYKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXJfdW5pdHRlc3QucHkKQEAgLTAsMCAr MSw1OCBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAq IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyMgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVz dCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmli dXRpb24uCisjICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9t b3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lm aWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIg QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U CisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMg QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCB1bml0dGVzdAorCitmcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3 ZWJraXRweS50aGlyZHBhcnR5Lm1vY2sgaW1wb3J0IE1vY2sKK2Zyb20gd2Via2l0cHkudG9vbC5t b2NrdG9vbCBpbXBvcnQgTW9ja1Rvb2wsIE1vY2tFeGVjdXRpdmUKK2Zyb20gd2Via2l0cHkudG9v bC5zZXJ2ZXJzLmdhcmRlbmluZ3NlcnZlciBpbXBvcnQgKgorCisKK2NsYXNzIE1vY2tTZXJ2ZXIo b2JqZWN0KToKKyAgICBkZWYgX19pbml0X18oc2VsZik6CisgICAgICAgIHNlbGYudG9vbCA9IE1v Y2tUb29sKCkKKyAgICAgICAgc2VsZi50b29sLmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUoc2hv dWxkX2xvZz1UcnVlKQorCisKKyMgVGhlIHJlYWwgR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5kbGVy IGhhcyBhIGNvbnN0cnVjdG9yIHRoYXQncyB0b28gaGFyZCB0bworIyBjYWxsIGluIGEgdW5pdCB0 ZXN0LCBzbyB3ZSBjcmVhdGUgYSBzdWJjbGFzcyB0aGF0J3MgZWFzaWVyIHRvIGNvbnN0cmN1dC4K K2NsYXNzIFRlc3RHYXJkZW5pbmdIVFRQUmVxdWVzdEhhbmRsZXIoR2FyZGVuaW5nSFRUUFJlcXVl c3RIYW5kbGVyKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgc2VydmVyKToKKyAgICAgICAgc2Vs Zi5zZXJ2ZXIgPSBzZXJ2ZXIKKworCitjbGFzcyBHYXJkZW5pbmdTZXJ2ZXJUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKKyAgICBkZWYgX3Bvc3RfdG9fcGF0aChzZWxmLCBwYXRoLCBleHBlY3RlZF9z dGRlcnI9Tm9uZSk6CisgICAgICAgIGhhbmRsZXIgPSBUZXN0R2FyZGVuaW5nSFRUUFJlcXVlc3RI YW5kbGVyKE1vY2tTZXJ2ZXIoKSkKKyAgICAgICAgaGFuZGxlci5wYXRoID0gcGF0aAorICAgICAg ICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgaGFuZGxlci5kb19QT1NULCBl eHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQorCisgICAgZGVmIHRlc3RfZW1wdHlfc3Rh dGUoc2VsZik6CisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBb J2VjaG8nLCAncm9sbG91dCcsICctLWZvcmNlLWNsZWFuJywgJy0tbm9uLWludGVyYWN0aXZlJywg JzIzMTQnLCAnTU9DSyByb2xsb3V0IHJlYXNvbiddXG4iCisgICAgICAgIHNlbGYuX3Bvc3RfdG9f cGF0aCgiL3JvbGxvdXQ/cmV2aXNpb249MjMxNCZyZWFzb249TU9DSytyb2xsb3V0K3JlYXNvbiIs IGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCg==