47650 2010-10-13 20:54:08 -0700 Make --port a global option and pass the port information to the commit-queue subprocess 2010-10-13 22:05:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth eric oldest_to_newest 293932 0 abarth 2010-10-13 20:54:08 -0700 Make --port a global option and pass the port information to the commit-queue subprocess 293936 1 70708 abarth 2010-10-13 20:59:53 -0700 Created attachment 70708 Patch 293953 2 70708 eric 2010-10-13 21:48:18 -0700 Comment on attachment 70708 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70708&action=review Relatively disgusting. BUt not all your fault. Please fix the above nits. > WebKitTools/Scripts/webkitpy/tool/commands/queues.py:130 > - self.options = options # FIXME: This code is wrong. Command.options is a list, this assumes an Options element! > + self._options = options Please dont' remove this fixme, this code is still WRONG. > WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py:87 > + queue._options = Mock() > + queue._options.iterations = 3 Um. Clearly wrong. > WebKitTools/Scripts/webkitpy/tool/commands/queuestest.py:83 > + def assert_queue_outputs(self, queue, args=None, work_item=None, expected_stdout=None, expected_stderr=None, expected_exceptions=None, options=None, tool=MockTool()): setting tool=MockTool() is wrong here. That will share an instance of MockTool() for all callers! 293956 3 abarth 2010-10-13 22:05:01 -0700 Committed r69737: <http://trac.webkit.org/changeset/69737> 70708 2010-10-13 20:59:53 -0700 2010-10-13 21:48:17 -0700 Patch bug-47650-20101013205952.patch text/plain 12413 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmMGI2MzM0ODIxMzMyNzMzYTMzN2RlNjU3ODM2ZjRlMGE2YzNlYWNiLi4yNTQwNTIy MmMxZGE3ZTE5MWVjM2ZjZmQyNjQ3Y2JkNjA1M2EwMjI5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAK IDIwMTAtMTAtMTMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIC0tcG9ydCBhIGdsb2Jh bCBvcHRpb24gYW5kIHBhc3MgdGhlIHBvcnQgaW5mb3JtYXRpb24gdG8gdGhlIGNvbW1pdC1xdWV1 ZSBzdWJwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NzY1MAorCisgICAgICAgIFRoaXMgcGF0Y2ggcGF2ZXMgdGhlIHdheSB0byBydW4gdGhl IGNvbW1pdC1xdWV1ZSBvbiBhIG5vbi1NYWMgcG9ydC4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvbWFpbi5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvb3B0aW9ucy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJl cGFyZWNoYW5nZWxvZy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv cnVudGVzdHMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0 ZS5weToKKworMjAxMC0xMC0xMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCiAg ICAgICAgIFJldmlld2VkIGJ5IENzYWJhIE9zenRyb2dvbsOhYy4KIAogICAgICAgICB3ZWJraXQt cGF0Y2ggYnVpbGQgc2hvdWxkbid0IG5lZWQgLS1idWlsZCB0byBhY3R1YWxseSBidWlsZCEKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1 ZXMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVz LnB5CmluZGV4IDRmYjFhN2MzMzU5YjNmYmU2ZTkzOTQxYzhmMjQ1NGQ2NzFjNzZkYTcuLmQ3MzNh YmZjYmJkYjQwMzlmOGIyMmU4OWE3YWI1M2Q4NzEyZTA5N2EgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weQpAQCAtODAsNiAr ODAsOCBAQCBjbGFzcyBBYnN0cmFjdFF1ZXVlKENvbW1hbmQsIFF1ZXVlRW5naW5lRGVsZWdhdGUp OgogICAgICAgICB3ZWJraXRfcGF0Y2hfYXJncyArPSBbIi0tc3RhdHVzLWhvc3Q9JXMiICUgc2Vs Zi5fdG9vbC5zdGF0dXNfc2VydmVyLmhvc3RdCiAgICAgICAgIGlmIHNlbGYuX3Rvb2wuc3RhdHVz X3NlcnZlci5ib3RfaWQ6CiAgICAgICAgICAgICB3ZWJraXRfcGF0Y2hfYXJncyArPSBbIi0tYm90 LWlkPSVzIiAlIHNlbGYuX3Rvb2wuc3RhdHVzX3NlcnZlci5ib3RfaWRdCisgICAgICAgIGlmIHNl bGYuX29wdGlvbnMucG9ydDoKKyAgICAgICAgICAgIHdlYmtpdF9wYXRjaF9hcmdzICs9IFsiLS1w b3J0PSVzIiAlIHNlbGYuX29wdGlvbnMucG9ydF0KICAgICAgICAgd2Via2l0X3BhdGNoX2FyZ3Mu ZXh0ZW5kKGFyZ3MpCiAgICAgICAgIHJldHVybiBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fYW5k X3Rocm93X2lmX2ZhaWwod2Via2l0X3BhdGNoX2FyZ3MpCiAKQEAgLTk2LDcgKzk4LDcgQEAgY2xh c3MgQWJzdHJhY3RRdWV1ZShDb21tYW5kLCBRdWV1ZUVuZ2luZURlbGVnYXRlKToKIAogICAgIGRl ZiBiZWdpbl93b3JrX3F1ZXVlKHNlbGYpOgogICAgICAgICBsb2coIkNBVVRJT046ICVzIHdpbGwg ZGlzY2FyZCBhbGwgbG9jYWwgY2hhbmdlcyBpbiBcIiVzXCIiICUgKHNlbGYubmFtZSwgc2VsZi5f dG9vbC5zY20oKS5jaGVja291dF9yb290KSkKLSAgICAgICAgaWYgc2VsZi5vcHRpb25zLmNvbmZp cm06CisgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuY29uZmlybToKICAgICAgICAgICAgIHJlc3Bv bnNlID0gc2VsZi5fdG9vbC51c2VyLnByb21wdCgiQXJlIHlvdSBzdXJlPyAgVHlwZSBcInllc1wi IHRvIGNvbnRpbnVlOiAiKQogICAgICAgICAgICAgaWYgKHJlc3BvbnNlICE9ICJ5ZXMiKToKICAg ICAgICAgICAgICAgICBlcnJvcigiVXNlciBkZWNsaW5lZC4iKQpAQCAtMTA4LDcgKzExMCw3IEBA IGNsYXNzIEFic3RyYWN0UXVldWUoQ29tbWFuZCwgUXVldWVFbmdpbmVEZWxlZ2F0ZSk6CiAKICAg ICBkZWYgc2hvdWxkX2NvbnRpbnVlX3dvcmtfcXVldWUoc2VsZik6CiAgICAgICAgIHNlbGYuX2l0 ZXJhdGlvbl9jb3VudCArPSAxCi0gICAgICAgIHJldHVybiBub3Qgc2VsZi5vcHRpb25zLml0ZXJh dGlvbnMgb3Igc2VsZi5faXRlcmF0aW9uX2NvdW50IDw9IHNlbGYub3B0aW9ucy5pdGVyYXRpb25z CisgICAgICAgIHJldHVybiBub3Qgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zIG9yIHNlbGYuX2l0 ZXJhdGlvbl9jb3VudCA8PSBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMKIAogICAgIGRlZiBuZXh0 X3dvcmtfaXRlbShzZWxmKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1 YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCkBAIC0xMjUsNyArMTI3LDcgQEAgY2xhc3MgQWJzdHJh Y3RRdWV1ZShDb21tYW5kLCBRdWV1ZUVuZ2luZURlbGVnYXRlKToKICAgICAjIENvbW1hbmQgbWV0 aG9kcwogCiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCwgZW5naW5l PVF1ZXVlRW5naW5lKToKLSAgICAgICAgc2VsZi5vcHRpb25zID0gb3B0aW9ucyAgIyBGSVhNRTog VGhpcyBjb2RlIGlzIHdyb25nLiAgQ29tbWFuZC5vcHRpb25zIGlzIGEgbGlzdCwgdGhpcyBhc3N1 bWVzIGFuIE9wdGlvbnMgZWxlbWVudCEKKyAgICAgICAgc2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMK ICAgICAgICAgc2VsZi5fdG9vbCA9IHRvb2wgICMgRklYTUU6IFRoaXMgY29kZSBpcyB3cm9uZyB0 b28hICBDb21tYW5kLmJpbmRfdG9fdG9vbCBoYW5kbGVzIHRoaXMhCiAgICAgICAgIHJldHVybiBl bmdpbmUoc2VsZi5uYW1lLCBzZWxmLCBzZWxmLl90b29sLndha2V1cF9ldmVudCkucnVuKCkKIApk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1 ZXVlc191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9xdWV1ZXNfdW5pdHRlc3QucHkKaW5kZXggOWU5OWEyMGQxZmU0YzkxNzk2MTA1MDY0ZTAz MjUwOTNkYWQ2MWMxMC4uZDY4MDA5ODEzNmIwMmQzYzk5OGU5MDhmNjc5YjYxMjM4YjA3N2VhYSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1 ZXVlc191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5CkBAIC02MCwyNSArNjAsMzEgQEAgY2xhc3MgQWJz dHJhY3RRdWV1ZVRlc3QoQ29tbWFuZHNUZXN0KToKICAgICBkZWYgdGVzdF9sb2dfZGlyZWN0b3J5 KHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhUZXN0UXVldWUoKS5fbG9nX2RpcmVj dG9yeSgpLCAidGVzdC1xdWV1ZS1sb2dzIikKIAotICAgIGRlZiBfYXNzZXJ0X3J1bl93ZWJraXRf cGF0Y2goc2VsZiwgcnVuX2FyZ3MpOgorICAgIGRlZiBfYXNzZXJ0X3J1bl93ZWJraXRfcGF0Y2go c2VsZiwgcnVuX2FyZ3MsIHBvcnQ9Tm9uZSk6CiAgICAgICAgIHF1ZXVlID0gVGVzdFF1ZXVlKCkK ICAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKICAgICAgICAgdG9vbC5zdGF0dXNfc2VydmVyLmJv dF9pZCA9ICJnb3J0IgogICAgICAgICB0b29sLmV4ZWN1dGl2ZSA9IE1vY2soKQogICAgICAgICBx dWV1ZS5iaW5kX3RvX3Rvb2wodG9vbCkKKyAgICAgICAgcXVldWUuX29wdGlvbnMgPSBNb2NrKCkK KyAgICAgICAgcXVldWUuX29wdGlvbnMucG9ydCA9IHBvcnQKIAogICAgICAgICBxdWV1ZS5ydW5f d2Via2l0X3BhdGNoKHJ1bl9hcmdzKQotICAgICAgICBleHBlY3RlZF9ydW5fYXJncyA9IFsiZWNo byIsICItLXN0YXR1cy1ob3N0PWV4YW1wbGUuY29tIiwgIi0tYm90LWlkPWdvcnQiXSArIHJ1bl9h cmdzCisgICAgICAgIGV4cGVjdGVkX3J1bl9hcmdzID0gWyJlY2hvIiwgIi0tc3RhdHVzLWhvc3Q9 ZXhhbXBsZS5jb20iLCAiLS1ib3QtaWQ9Z29ydCJdCisgICAgICAgIGlmIHBvcnQ6CisgICAgICAg ICAgICBleHBlY3RlZF9ydW5fYXJncy5hcHBlbmQoIi0tcG9ydD0lcyIgJSBwb3J0KQorICAgICAg ICBleHBlY3RlZF9ydW5fYXJncy5leHRlbmQocnVuX2FyZ3MpCiAgICAgICAgIHRvb2wuZXhlY3V0 aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbC5hc3NlcnRfY2FsbGVkX3dpdGgoZXhwZWN0ZWRfcnVu X2FyZ3MpCiAKICAgICBkZWYgdGVzdF9ydW5fd2Via2l0X3BhdGNoKHNlbGYpOgogICAgICAgICBz ZWxmLl9hc3NlcnRfcnVuX3dlYmtpdF9wYXRjaChbMV0pCiAgICAgICAgIHNlbGYuX2Fzc2VydF9y dW5fd2Via2l0X3BhdGNoKFsib25lIiwgMl0pCisgICAgICAgIHNlbGYuX2Fzc2VydF9ydW5fd2Vi a2l0X3BhdGNoKFsxXSwgcG9ydD0ibW9ja3BvcnQiKQogCiAgICAgZGVmIHRlc3RfaXRlcmF0aW9u X2NvdW50KHNlbGYpOgogICAgICAgICBxdWV1ZSA9IFRlc3RRdWV1ZSgpCi0gICAgICAgIHF1ZXVl Lm9wdGlvbnMgPSBNb2NrKCkKLSAgICAgICAgcXVldWUub3B0aW9ucy5pdGVyYXRpb25zID0gMwor ICAgICAgICBxdWV1ZS5fb3B0aW9ucyA9IE1vY2soKQorICAgICAgICBxdWV1ZS5fb3B0aW9ucy5p dGVyYXRpb25zID0gMwogICAgICAgICBzZWxmLmFzc2VydFRydWUocXVldWUuc2hvdWxkX2NvbnRp bnVlX3dvcmtfcXVldWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHF1ZXVlLnNob3VsZF9j b250aW51ZV93b3JrX3F1ZXVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShxdWV1ZS5zaG91 bGRfY29udGludWVfd29ya19xdWV1ZSgpKQpAQCAtODYsNyArOTIsNyBAQCBjbGFzcyBBYnN0cmFj dFF1ZXVlVGVzdChDb21tYW5kc1Rlc3QpOgogCiAgICAgZGVmIHRlc3Rfbm9faXRlcmF0aW9uX2Nv dW50KHNlbGYpOgogICAgICAgICBxdWV1ZSA9IFRlc3RRdWV1ZSgpCi0gICAgICAgIHF1ZXVlLm9w dGlvbnMgPSBNb2NrKCkKKyAgICAgICAgcXVldWUuX29wdGlvbnMgPSBNb2NrKCkKICAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHF1ZXVlLnNob3VsZF9jb250aW51ZV93b3JrX3F1ZXVlKCkpCiAgICAg ICAgIHNlbGYuYXNzZXJ0VHJ1ZShxdWV1ZS5zaG91bGRfY29udGludWVfd29ya19xdWV1ZSgpKQog ICAgICAgICBzZWxmLmFzc2VydFRydWUocXVldWUuc2hvdWxkX2NvbnRpbnVlX3dvcmtfcXVldWUo KSkKQEAgLTE0MCw2ICsxNDYsOCBAQCBjbGFzcyBBYnN0cmFjdFBhdGNoUXVldWVUZXN0KENvbW1h bmRzVGVzdCk6CiAgICAgICAgIHF1ZXVlID0gQWJzdHJhY3RQYXRjaFF1ZXVlKCkKICAgICAgICAg dG9vbCA9IE1vY2tUb29sKCkKICAgICAgICAgcXVldWUuYmluZF90b190b29sKHRvb2wpCisgICAg ICAgIHF1ZXVlLl9vcHRpb25zID0gTW9jaygpCisgICAgICAgIHF1ZXVlLl9vcHRpb25zLnBvcnQg PSBOb25lCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHF1ZXVlLl9mZXRjaF9uZXh0X3dvcmtf aXRlbSgpLCBOb25lKQogICAgICAgICB0b29sLnN0YXR1c19zZXJ2ZXIgPSBNb2NrU3RhdHVzU2Vy dmVyKHdvcmtfaXRlbXM9WzIsIDEsIDNdKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhxdWV1 ZS5fZmV0Y2hfbmV4dF93b3JrX2l0ZW0oKSwgMikKQEAgLTE1MCw2ICsxNTgsOCBAQCBjbGFzcyBB YnN0cmFjdFJldmlld1F1ZXVlVGVzdChDb21tYW5kc1Rlc3QpOgogICAgICAgICBxdWV1ZSA9IFRl c3RSZXZpZXdRdWV1ZSgpCiAgICAgICAgIHRvb2wgPSBNb2NrVG9vbCgpCiAgICAgICAgIHF1ZXVl LmJpbmRfdG9fdG9vbCh0b29sKQorICAgICAgICBxdWV1ZS5fb3B0aW9ucyA9IE1vY2soKQorICAg ICAgICBxdWV1ZS5fb3B0aW9ucy5wb3J0ID0gTm9uZQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhxdWV1ZS5jb2xsZWN0aW9uX25hbWUoKSwgInRlc3QtcmV2aWV3LXF1ZXVlIikKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMocXVldWUuZmV0Y2hfcG90ZW50aWFsX3BhdGNoX2lkcygpLCBbMTAz XSkKICAgICAgICAgcXVldWUuc3RhdHVzX3NlcnZlcigpCkBAIC0yOTEsNiArMzAxLDggQEAgTU9D SzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIFBhc3MKICAgICBkZWYgdGVzdF9tYW51YWxf cmVqZWN0X2R1cmluZ19wcm9jZXNzaW5nKHNlbGYpOgogICAgICAgICBxdWV1ZSA9IFNlY29uZFRo b3VnaHRzQ29tbWl0UXVldWUoKQogICAgICAgICBxdWV1ZS5iaW5kX3RvX3Rvb2woTW9ja1Rvb2wo KSkKKyAgICAgICAgcXVldWUuX29wdGlvbnMgPSBNb2NrKCkKKyAgICAgICAgcXVldWUuX29wdGlv bnMucG9ydCA9IE5vbmUKICAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIiIiTU9DSzogdXBkYXRl X3N0YXR1czogY29tbWl0LXF1ZXVlIEFwcGxpZWQgcGF0Y2gKIE1PQ0s6IHVwZGF0ZV9zdGF0dXM6 IGNvbW1pdC1xdWV1ZSBCdWlsdCBwYXRjaAogTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1 ZXVlIFBhc3NlZCB0ZXN0cwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3F1ZXVlc3Rlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQppbmRleCA5ZjM1ODNkM2RlMWI2Yzc2NTJm MTViODFjN2I4ZGMwNTk0MzIyNzc3Li4wZDYzNjNmZTVhNDMyY2YxZjIwODY5YzRkMzJiMDQ1MmQy NDI3YmU5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvcXVldWVzdGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQpAQCAtODAsMTMgKzgwLDE2IEBAIGNsYXNzIFF1ZXVl c1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzdHJpbmdfcmVwbGFjZW1lbnRzID0g eyJuYW1lIjogbmFtZSwgJ2NoZWNrb3V0X2Rpcic6IGNoZWNrb3V0X2Rpcn0KICAgICAgICAgcmV0 dXJuICJDQVVUSU9OOiAlKG5hbWUpcyB3aWxsIGRpc2NhcmQgYWxsIGxvY2FsIGNoYW5nZXMgaW4g XCIlKGNoZWNrb3V0X2RpcilzXCJcblJ1bm5pbmcgV2ViS2l0ICUobmFtZSlzLlxuTU9DSzogdXBk YXRlX3N0YXR1czogJShuYW1lKXMgU3RhcnRpbmcgUXVldWVcbiIgJSBzdHJpbmdfcmVwbGFjZW1l bnRzCiAKLSAgICBkZWYgYXNzZXJ0X3F1ZXVlX291dHB1dHMoc2VsZiwgcXVldWUsIGFyZ3M9Tm9u ZSwgd29ya19pdGVtPU5vbmUsIGV4cGVjdGVkX3N0ZG91dD1Ob25lLCBleHBlY3RlZF9zdGRlcnI9 Tm9uZSwgZXhwZWN0ZWRfZXhjZXB0aW9ucz1Ob25lLCBvcHRpb25zPU1vY2soKSwgdG9vbD1Nb2Nr VG9vbCgpKToKKyAgICBkZWYgYXNzZXJ0X3F1ZXVlX291dHB1dHMoc2VsZiwgcXVldWUsIGFyZ3M9 Tm9uZSwgd29ya19pdGVtPU5vbmUsIGV4cGVjdGVkX3N0ZG91dD1Ob25lLCBleHBlY3RlZF9zdGRl cnI9Tm9uZSwgZXhwZWN0ZWRfZXhjZXB0aW9ucz1Ob25lLCBvcHRpb25zPU5vbmUsIHRvb2w9TW9j a1Rvb2woKSk6CiAgICAgICAgIGlmIG5vdCBleHBlY3RlZF9zdGRvdXQ6CiAgICAgICAgICAgICBl eHBlY3RlZF9zdGRvdXQgPSB7fQogICAgICAgICBpZiBub3QgZXhwZWN0ZWRfc3RkZXJyOgogICAg ICAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0ge30KICAgICAgICAgaWYgbm90IGFyZ3M6CiAgICAg ICAgICAgICBhcmdzID0gW10KKyAgICAgICAgaWYgbm90IG9wdGlvbnM6CisgICAgICAgICAgICBv cHRpb25zID0gTW9jaygpCisgICAgICAgICAgICBvcHRpb25zLnBvcnQgPSBOb25lCiAgICAgICAg IGlmIG5vdCB3b3JrX2l0ZW06CiAgICAgICAgICAgICB3b3JrX2l0ZW0gPSBzZWxmLm1vY2tfd29y a19pdGVtCiAgICAgICAgIHRvb2wudXNlci5wcm9tcHQgPSBsYW1iZGEgbWVzc2FnZTogInllcyIK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tYWluLnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21haW4ucHkKaW5kZXggYjQ3YmI0M2Zk OTRkNGUwMTkyZDZiNmFjYzUyZDg3NGViODdiOTE2NS4uNzIxYmY1OWUwNGNhZmI2NTBiZWMwZDg2 YmE2NzJhNzBkOGEwMGJmMSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL21haW4ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21h aW4ucHkKQEAgLTYyLDYgKzYyLDcgQEAgY2xhc3MgV2ViS2l0UGF0Y2goTXVsdGlDb21tYW5kVG9v bCk6CiAgICAgICAgIG1ha2Vfb3B0aW9uKCItLXN0YXR1cy1ob3N0IiwgYWN0aW9uPSJzdG9yZSIs IGRlc3Q9InN0YXR1c19ob3N0IiwgdHlwZT0ic3RyaW5nIiwgaGVscD0iSG9zdG5hbWUgKGUuZy4g bG9jYWxob3N0IG9yIGNvbW1pdC53ZWJraXQub3JnKSB3aGVyZSBzdGF0dXMgdXBkYXRlcyBzaG91 bGQgYmUgcG9zdGVkLiIpLAogICAgICAgICBtYWtlX29wdGlvbigiLS1ib3QtaWQiLCBhY3Rpb249 InN0b3JlIiwgZGVzdD0iYm90X2lkIiwgdHlwZT0ic3RyaW5nIiwgaGVscD0iSWRlbnRpZmllciBm b3IgdGhpcyBib3QgKGlmIG11bHRpcGxlIGJvdHMgYXJlIHJ1bm5pbmcgZm9yIGEgcXVldWUpIiks CiAgICAgICAgIG1ha2Vfb3B0aW9uKCItLWlyYy1wYXNzd29yZCIsIGFjdGlvbj0ic3RvcmUiLCBk ZXN0PSJpcmNfcGFzc3dvcmQiLCB0eXBlPSJzdHJpbmciLCBoZWxwPSJQYXNzd29yZCB0byB1c2Ug d2hlbiBjb21tdW5pY2F0aW5nIHZpYSBJUkMuIiksCisgICAgICAgIG1ha2Vfb3B0aW9uKCItLXBv cnQiLCBhY3Rpb249InN0b3JlIiwgZGVzdD0icG9ydCIsIGRlZmF1bHQ9Tm9uZSwgaGVscD0iU3Bl Y2lmeSBhIHBvcnQgKGUuZy4sIG1hYywgcXQsIGd0aywgLi4uKS4iKSwKICAgICBdCiAKICAgICBk ZWYgX19pbml0X18oc2VsZiwgcGF0aCk6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5CmluZGV4IDNkYzE5NjM5NWQxZjg2OWRjOWViZmM1 NzdjZWFmNjViNjBkMGZmZDQuLjgzNWZkYmE2ZDBjOWQ3NGZlYTViNzgyYjRjYzcwNGQwY2Y0NWU2 YTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9v cHRpb25zLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9v cHRpb25zLnB5CkBAIC01MCw3ICs1MCw2IEBAIGNsYXNzIE9wdGlvbnMob2JqZWN0KToKICAgICBv YnNvbGV0ZV9wYXRjaGVzID0gbWFrZV9vcHRpb24oIi0tbm8tb2Jzb2xldGUiLCBhY3Rpb249InN0 b3JlX2ZhbHNlIiwgZGVzdD0ib2Jzb2xldGVfcGF0Y2hlcyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0i RG8gbm90IG9ic29sZXRlIG9sZCBwYXRjaGVzIGJlZm9yZSBwb3N0aW5nIHRoaXMgb25lLiIpCiAg ICAgb3Blbl9idWcgPSBtYWtlX29wdGlvbigiLS1vcGVuLWJ1ZyIsIGFjdGlvbj0ic3RvcmVfdHJ1 ZSIsIGRlc3Q9Im9wZW5fYnVnIiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iT3BlbnMgdGhlIGFzc29j aWF0ZWQgYnVnIGluIGEgYnJvd3Nlci4iKQogICAgIHBhcmVudF9jb21tYW5kID0gbWFrZV9vcHRp b24oIi0tcGFyZW50LWNvbW1hbmQiLCBhY3Rpb249InN0b3JlIiwgZGVzdD0icGFyZW50X2NvbW1h bmQiLCBkZWZhdWx0PU5vbmUsIGhlbHA9IihJbnRlcm5hbCkgVGhlIGNvbW1hbmQgdGhhdCBzcGF3 bmVkIHRoaXMgaW5zdGFuY2UuIikKLSAgICBwb3J0ID0gbWFrZV9vcHRpb24oIi0tcG9ydCIsIGFj dGlvbj0ic3RvcmUiLCBkZXN0PSJwb3J0IiwgZGVmYXVsdD1Ob25lLCBoZWxwPSJTcGVjaWZ5IGEg cG9ydCAoZS5nLiwgbWFjLCBxdCwgZ3RrLCAuLi4pLiIpCiAgICAgcXVpZXQgPSBtYWtlX29wdGlv bigiLS1xdWlldCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9InF1aWV0IiwgZGVmYXVsdD1G YWxzZSwgaGVscD0iUHJvZHVjZSBsZXNzIGNvbnNvbGUgb3V0cHV0LiIpCiAgICAgcmVxdWVzdF9j b21taXQgPSBtYWtlX29wdGlvbigiLS1yZXF1ZXN0LWNvbW1pdCIsIGFjdGlvbj0ic3RvcmVfdHJ1 ZSIsIGRlc3Q9InJlcXVlc3RfY29tbWl0IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iTWFyayB0aGUg cGF0Y2ggYXMgbmVlZGluZyBhdXRvLWNvbW1pdCBhZnRlciByZXZpZXcuIikKICAgICByZXZpZXcg PSBtYWtlX29wdGlvbigiLS1uby1yZXZpZXciLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0i cmV2aWV3IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEbyBub3QgbWFyayB0aGUgcGF0Y2ggZm9yIHJl dmlldy4iKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0 ZXBzL3ByZXBhcmVjaGFuZ2Vsb2cucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weQppbmRleCBjZTA0MDI0OGYxZjAzOGZiMmM2ODll NTQ1NGYwYzFmYWJiNzkzZjQ1Li42YTY5NjBhMDRiMzZlOGMxZDhhOWFlNmVlNmM5MWNiMWM2Mjg0 YjU4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv cHJlcGFyZWNoYW5nZWxvZy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weQpAQCAtMzksNyArMzksNiBAQCBjbGFzcyBQcmVw YXJlQ2hhbmdlTG9nKEFic3RyYWN0U3RlcCk6CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIG9w dGlvbnMoY2xzKToKICAgICAgICAgcmV0dXJuIEFic3RyYWN0U3RlcC5vcHRpb25zKCkgKyBbCi0g ICAgICAgICAgICBPcHRpb25zLnBvcnQsCiAgICAgICAgICAgICBPcHRpb25zLnF1aWV0LAogICAg ICAgICAgICAgT3B0aW9ucy5lbWFpbCwKICAgICAgICAgICAgIE9wdGlvbnMuZ2l0X2NvbW1pdCwK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50 ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50ZXN0 cy5weQppbmRleCBhZmYxZmQ5ZGVkZjYzZjI5YjgzMjg3NWJjNTQ5NzZjNmJmMDEzYjg2Li44OWVm Njk0OTczN2M1ZmEzNGFhMDFmOTZjMWM2ZmEwNzI2ODYyMWM5IDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzLnB5CkBAIC0zNyw3ICsz Nyw2IEBAIGNsYXNzIFJ1blRlc3RzKEFic3RyYWN0U3RlcCk6CiAgICAgICAgICAgICBPcHRpb25z LnRlc3QsCiAgICAgICAgICAgICBPcHRpb25zLm5vbl9pbnRlcmFjdGl2ZSwKICAgICAgICAgICAg IE9wdGlvbnMucXVpZXQsCi0gICAgICAgICAgICBPcHRpb25zLnBvcnQsCiAgICAgICAgIF0KIAog ICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy91cGRhdGUucHkKaW5kZXggMGY0NTBmMzdkMjY3ZGU4NGM0YmViZjg2 MTQzZDgxOTA3NWU2ZjkzNS4uOGMyOTBmOTdiMTBjYzJhOThiOTEzMmNkMDY3NmY4Mjk5MTBmMmE2 MCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3Vw ZGF0ZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvdXBk YXRlLnB5CkBAIC0zNiw3ICszNiw2IEBAIGNsYXNzIFVwZGF0ZShBYnN0cmFjdFN0ZXApOgogICAg IGRlZiBvcHRpb25zKGNscyk6CiAgICAgICAgIHJldHVybiBBYnN0cmFjdFN0ZXAub3B0aW9ucygp ICsgWwogICAgICAgICAgICAgT3B0aW9ucy51cGRhdGUsCi0gICAgICAgICAgICBPcHRpb25zLnBv cnQsCiAgICAgICAgIF0KIAogICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgo=