78181 2012-02-08 16:48:58 -0800 nrwt: simplify worker interface 2012-02-16 19:48:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78185 78187 1 dpranke dpranke abarth eric ojan tony webkit.review.bot oldest_to_newest 552629 0 dpranke 2012-02-08 16:48:58 -0800 nrwt: simplify worker interface 552658 1 126196 dpranke 2012-02-08 17:09:03 -0800 Created attachment 126196 Patch 557904 2 127311 dpranke 2012-02-15 22:31:51 -0800 Created attachment 127311 merge to r107884 557905 3 dpranke 2012-02-15 22:33:46 -0800 Tony, can you take a look at this? 557924 4 127314 dpranke 2012-02-15 23:06:55 -0800 Created attachment 127314 fix indentation 558303 5 127314 tony 2012-02-16 10:21:30 -0800 Comment on attachment 127314 fix indentation Should you remove duplicate methods in _TestWorker? Since there's only one real Worker implementation, it's impossible to tell what should be shared and what shouldn't be shared. There's nothing wrong with this code change, but I can't evaluate if it's better or worse than before. 558396 6 dpranke 2012-02-16 11:45:13 -0800 (In reply to comment #5) > (From update of attachment 127314 [details]) > Should you remove duplicate methods in _TestWorker? > Good catch, will do. > Since there's only one real Worker implementation, it's impossible to tell what should be shared and what shouldn't be shared. There's nothing wrong with this code change, but I can't evaluate if it's better or worse than before. for a second implementation, check out the Worker implementation that could be used in test-webkitpy in https://bugs.webkit.org/attachment.cgi?id=126445&action=review (part of bug 78185). Ultimately the whole message-passing aspect of this will get hidden and I can cut a couple hundred lines out of manager_worker_broker.py, dramatically simplifying the implementation, but I don't quite have that patch ready for review yet. 558434 7 tony 2012-02-16 12:24:09 -0800 I was trying to make 2 points: 1) An abstract interface or base class with a single implementation don't add value. _TestWorker should inherit from Worker. 2) When creating an abstract interface or base class, it's easier to understand when there are two implementations. Which is to say, I would rather review (a) a patch which adds the new implementation, then refactors to share code or (b) a patch that adds the second implementation and base class at the same time. I'm sure when you implemented this, you did either (a) or (b). In the current patch, I don't see any of that, so I can't evaluate whether this is an improvement. This patch is fine, but it doesn't make sense without future context. 558716 8 dpranke 2012-02-16 17:11:51 -0800 Committed r108005: <http://trac.webkit.org/changeset/108005> 558814 9 dpranke 2012-02-16 19:21:34 -0800 (In reply to comment #7) > I was trying to make 2 points: > 1) An abstract interface or base class with a single implementation don't add value. _TestWorker should inherit from Worker. I'm not sure I agree with the first sentence, but this bug is probably not the ideal place to discuss such a broad statement about design :). I have considered your point, though. > 2) When creating an abstract interface or base class, it's easier to understand when there are two implementations. Which is to say, I would rather review (a) a patch which adds the new implementation, then refactors to share code or (b) a patch that adds the second implementation and base class at the same time. I'm sure when you implemented this, you did either (a) or (b). In the current patch, I don't see any of that, so I can't evaluate whether this is an improvement. > > This patch is fine, but it doesn't make sense without future context. Understood. Unfortunately, this can be hard to do in practice. I will attempt to do better in the future. 558831 10 dpranke 2012-02-16 19:48:58 -0800 (In reply to comment #9) > I'm not sure I agree with the first sentence, but this bug is probably not the ideal place to discuss such a broad statement about design :). I have considered your point, though. > Note that I would like to understand what you're getting at here better; this was not meant to be dismissive. Also, I forgot to actually fix/update the test code ... see bug 78870. 126196 2012-02-08 17:09:03 -0800 2012-02-15 22:31:46 -0800 Patch bug-78181-20120208170902.patch text/plain 6383 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MTMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWYyZjA2NGY5NWEzYjU2OGE2OTQzZGVjOTMzZWFmMDY4 MjVjNDM2Ni4uMjhmYWEyZmRiMDI2OWYzMDliYjM0ZTFkM2Y5YjJjOTgxNDllYjc2NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMx IEBACiAyMDEyLTAyLTA4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IHNpbXBsaWZ5IHdvcmtlciBpbnRlcmZhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4MTgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgcHVzaGVzIHNvbWUgcm91 dGluZXMgZnJvbSB0aGUgbGF5b3V0X3Rlc3RzJyB3b3JrZXIKKyAgICAgICAgaW1wbGVtZW50YXRp b24gdG8gdGhlIGJhc2UgY2xhc3MsIHNpbmNlIHRoZXkncmUgcHJldHR5IG11Y2gKKyAgICAgICAg Ym9pbGVycGxhdGUgY29kZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfd29ya2VyX2Jyb2tlci5weToKKyAgICAgICAgKGdldC5z aG91bGQpOgorICAgICAgICAoQWJzdHJhY3RXb3JrZXIuX19pbml0X18pOgorICAgICAgICAoQWJz dHJhY3RXb3JrZXIpOgorICAgICAgICAoQWJzdHJhY3RXb3JrZXIubmFtZSk6CisgICAgICAgIChB YnN0cmFjdFdvcmtlci5zdG9wX2hhbmRsaW5nX21lc3NhZ2VzKToKKyAgICAgICAgKEFic3RyYWN0 V29ya2VyLnJ1bik6CisgICAgICAgIChBYnN0cmFjdFdvcmtlci5pc19kb25lKToKKyAgICAgICAg KEFic3RyYWN0V29ya2VyLmNhbmNlbCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5OgorICAgICAgICAoV29ya2VyLl9faW5pdF9f KToKKyAgICAgICAgKFdvcmtlci5fZmluaXNoX2luaXRpYWxpemluZyk6CisgICAgICAgIChXb3Jr ZXIucnVuKToKKyAgICAgICAgKFdvcmtlci5oYW5kbGVfc3RvcCk6CisKKzIwMTItMDItMDggIERp cmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgd2Via2l0cHk6IHN0 YXJ0IGNsZWFuaW5nIHVwIG1hbmFnZXJfd29ya2VyX2Jyb2tlciBpbiBwcmVwIGZvciByZXVzZSBi eSB0ZXN0LXdlYmtpdHB5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03ODE3MQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9r ZXIucHkKaW5kZXggNjM5YmJmZWI0MmZmOTQxYjUyYjJjZTM1ZGVkOTJjNDM5ZTM1NmJmYi4uODg1 YjQ2ODI4ZWVmYzdiMzcyM2RiZmI5ZGQ5NDBkYWNlYmY2ZDRlYSAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJf YnJva2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL21hbmFnZXJfd29ya2VyX2Jyb2tlci5weQpAQCAtNzIsNyArNzIsNyBAQCBkZWYgZ2V0 KHdvcmtlcl9tb2RlbCwgY2xpZW50LCB3b3JrZXJfY2xhc3MpOgogICAgICAgICB3b3JrZXJfbW9k ZWwgLSB0eXBlIG9mIHdvcmtlcnMgdG8gdXNlCiAgICAgICAgIGNsaWVudCAtIG1lc3NhZ2VfYnJv a2VyLkJyb2tlckNsaWVudCBpbXBsZW1lbnRhdGlvbiB0byBkaXNwYXRjaAogICAgICAgICAgICAg cmVwbGllcyB0by4KLSAgICAgICAgd29ya2VyX2NsYXNzIC0gdHlwZSBvZiB3b3JrZXJzIHRvIGNy ZWF0ZS4gVGhpcyBjbGFzcyBtdXN0IGltcGxlbWVudAorICAgICAgICB3b3JrZXJfY2xhc3MgLSB0 eXBlIG9mIHdvcmtlcnMgdG8gY3JlYXRlLiBUaGlzIGNsYXNzIHNob3VsZCBvdmVycmlkZQogICAg ICAgICAgICAgdGhlIG1ldGhvZHMgaW4gQWJzdHJhY3RXb3JrZXIuCiAgICAgUmV0dXJuczoKICAg ICAgICAgQSBoYW5kbGUgdG8gYW4gb2JqZWN0IHRoYXQgd2lsbCB0YWxrIHRvIGEgbWVzc2FnZSBi cm9rZXIgY29uZmlndXJlZApAQCAtMTA3LDE3ICsxMDcsNDEgQEAgY2xhc3MgQWJzdHJhY3RXb3Jr ZXIobWVzc2FnZV9icm9rZXIuQnJva2VyQ2xpZW50KToKICAgICAgICAgc2VsZi5fd29ya2VyX2Nv bm5lY3Rpb24gPSB3b3JrZXJfY29ubmVjdGlvbgogICAgICAgICBzZWxmLl93b3JrZXJfbnVtYmVy ID0gd29ya2VyX251bWJlcgogICAgICAgICBzZWxmLl9uYW1lID0gJ3dvcmtlci8lZCcgJSB3b3Jr ZXJfbnVtYmVyCisgICAgICAgIHNlbGYuX2NhbmNlbGVkID0gRmFsc2UKKyAgICAgICAgc2VsZi5f ZG9uZSA9IEZhbHNlCisKKyAgICBkZWYgbmFtZShzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYu X25hbWUKKworICAgIGRlZiBzdG9wX2hhbmRsaW5nX21lc3NhZ2VzKHNlbGYpOgorICAgICAgICBz ZWxmLl9kb25lID0gVHJ1ZQogCiAgICAgZGVmIHJ1bihzZWxmKToKICAgICAgICAgIiIiQ2FsbGJh Y2sgZm9yIHRoZSB3b3JrZXIgdG8gc3RhcnQgZXhlY3V0aW5nLiBUeXBpY2FsbHkgZG9lcyBhbnkK ICAgICAgICAgcmVtYWluaW5nIGluaXRpYWxpemF0aW9uIGFuZCB0aGVuIGNhbGxzIGJyb2tlcl9j b25uZWN0aW9uLnJ1bl9tZXNzYWdlX2xvb3AoKS4iIiIKLSAgICAgICAgcmFpc2UgTm90SW1wbGVt ZW50ZWRFcnJvcgorICAgICAgICBleGNlcHRpb25fbXNnID0gJycKKyAgICAgICAgdHJ5OgorICAg ICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucnVuX21lc3NhZ2VfbG9vcCgpCisgICAg ICAgICAgICBpZiBub3Qgc2VsZi5pc19kb25lKCk6CisgICAgICAgICAgICAgICAgcmFpc2UgQXNz ZXJ0aW9uRXJyb3IoIiVzOiByYW4gb3V0IG9mIG1lc3NhZ2VzIGluIHdvcmtlciBxdWV1ZS4iCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSBzZWxmLl9uYW1lKQorICAgICAg ICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CisgICAgICAgICAgICBleGNlcHRpb25fbXNnID0g IiwgaW50ZXJydXB0ZWQiCisgICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5yYWlz ZV9leGNlcHRpb24oc3lzLmV4Y19pbmZvKCkpCisgICAgICAgIGV4Y2VwdDoKKyAgICAgICAgICAg IGV4Y2VwdGlvbl9tc2cgPSAiLCBleGNlcHRpb24gcmFpc2VkIgorICAgICAgICAgICAgc2VsZi5f d29ya2VyX2Nvbm5lY3Rpb24ucmFpc2VfZXhjZXB0aW9uKHN5cy5leGNfaW5mbygpKQorICAgICAg ICBmaW5hbGx5OgorICAgICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgZG9uZSB3aXRoIG1lc3NhZ2Ug bG9vcCVzIiAlIChzZWxmLl9uYW1lLCBleGNlcHRpb25fbXNnKSkKKworICAgIGRlZiBpc19kb25l KHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5fZG9uZSBvciBzZWxmLl9jYW5jZWxlZAogCiAg ICAgZGVmIGNhbmNlbChzZWxmKToKICAgICAgICAgIiIiQ2FsbGVkIHdoZW4gcG9zc2libGUgdG8g aW5kaWNhdGUgdG8gdGhlIHdvcmtlciB0byBzdG9wIHByb2Nlc3NpbmcKICAgICAgICAgbWVzc2Fn ZXMgYW5kIHNodXQgZG93bi4gTm90ZSB0aGF0IHdvcmtlcnMgbWF5IGJlIHN0b3BwZWQgd2l0aG91 dCB0aGlzCiAgICAgICAgIG1ldGhvZCBiZWluZyBjYWxsZWQsIHNvIGNsaWVudHMgc2hvdWxkIG5v dCByZWx5IHNvbGVseSBvbiB0aGlzLiIiIgotICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVy cm9yCisgICAgICAgIHNlbGYuX2NhbmNlbGVkID0gVHJ1ZQogCiAKIGNsYXNzIF9NYW5hZ2VyQ29u bmVjdGlvbihtZXNzYWdlX2Jyb2tlci5Ccm9rZXJDb25uZWN0aW9uKToKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5w eQppbmRleCA2MGI1M2U0MDQ2N2Y0MTYwOTgwOTY4M2JlYmM2NDYxOTNmMjkzMjIyLi5hNjdiMTlj ZWViNDg1NmJhMTdhODBhOGFjNmZlMmZkY2NiYTE3MTdhIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5CkBA IC01Myw4ICs1Myw2IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJh Y3RXb3JrZXIpOgogICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSA9IHJlc3VsdHNfZGly ZWN0b3J5CiAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25zCiAgICAgICAgIHNlbGYuX3Jl YWxfcG9ydF9uYW1lID0gcmVhbF9wb3J0X25hbWUKLSAgICAgICAgc2VsZi5fZG9uZSA9IEZhbHNl Ci0gICAgICAgIHNlbGYuX2NhbmNlbGVkID0gRmFsc2UKIAogICAgIGRlZiBfX2RlbF9fKHNlbGYp OgogICAgICAgICBzZWxmLmNsZWFudXAoKQpAQCAtOTIsMzUgKzkwLDEzIEBAIGNsYXNzIFdvcmtl cihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICBzZWxmLl90 ZXN0c19ydW5fZmlsZSA9IHNlbGYuX2ZpbGVzeXN0ZW0ub3Blbl90ZXh0X2ZpbGVfZm9yX3dyaXRp bmcodGVzdHNfcnVuX2ZpbGVuYW1lKQogICAgICAgICBzZWxmLl9kcml2ZXIgPSBOb25lCiAKLSAg ICBkZWYgY2FuY2VsKHNlbGYpOgotICAgICAgICAiIiJBdHRlbXB0IHRvIGFib3J0IHByb2Nlc3Np bmcgKGJlc3QgZWZmb3J0KS4iIiIKLSAgICAgICAgc2VsZi5fY2FuY2VsZWQgPSBUcnVlCi0KLSAg ICBkZWYgaXNfZG9uZShzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2RvbmUgb3Igc2VsZi5f Y2FuY2VsZWQKLQotICAgIGRlZiBuYW1lKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5fbmFt ZQotCiAgICAgZGVmIHJ1bihzZWxmLCBwb3J0PU5vbmUpOgogICAgICAgICBzZWxmLl9maW5pc2hf aW5pdGlhbGl6aW5nKHBvcnQpCiAKLSAgICAgICAgZXhjZXB0aW9uX21zZyA9ICIiCiAgICAgICAg IF9sb2cuZGVidWcoIiVzIHN0YXJ0aW5nIiAlIHNlbGYuX25hbWUpCi0KICAgICAgICAgdHJ5Ogot ICAgICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucnVuX21lc3NhZ2VfbG9vcCgpCi0g ICAgICAgICAgICBpZiBub3Qgc2VsZi5pc19kb25lKCk6Ci0gICAgICAgICAgICAgICAgcmFpc2Ug QXNzZXJ0aW9uRXJyb3IoIiVzOiByYW4gb3V0IG9mIG1lc3NhZ2VzIGluIHdvcmtlciBxdWV1ZS4i Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSBzZWxmLl9uYW1lKQotICAg ICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6Ci0gICAgICAgICAgICBleGNlcHRpb25fbXNn ID0gIiwgaW50ZXJydXB0ZWQiCi0gICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5y YWlzZV9leGNlcHRpb24oc3lzLmV4Y19pbmZvKCkpCi0gICAgICAgIGV4Y2VwdDoKLSAgICAgICAg ICAgIGV4Y2VwdGlvbl9tc2cgPSAiLCBleGNlcHRpb24gcmFpc2VkIgotICAgICAgICAgICAgc2Vs Zi5fd29ya2VyX2Nvbm5lY3Rpb24ucmFpc2VfZXhjZXB0aW9uKHN5cy5leGNfaW5mbygpKQorICAg ICAgICAgICAgc3VwZXIoV29ya2VyLCBzZWxmKS5ydW4oKQogICAgICAgICBmaW5hbGx5OgotICAg ICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgZG9uZSB3aXRoIG1lc3NhZ2UgbG9vcCVzIiAlIChzZWxm Ll9uYW1lLCBleGNlcHRpb25fbXNnKSkKICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0 aW9uLnBvc3RfbWVzc2FnZSgnZG9uZScpCiAgICAgICAgICAgICBzZWxmLmNsZWFudXAoKQogICAg ICAgICAgICAgc2VsZi5fcHJpbnRlci5jbGVhbnVwKCkKQEAgLTE0MSw3ICsxMTcsNyBAQCBjbGFz cyBXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2VyLkFic3RyYWN0V29ya2VyKToKICAgICAgICAg c2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdmaW5pc2hlZF9saXN0JywgbGlz dF9uYW1lLCBudW1fdGVzdHMsIGVsYXBzZWRfdGltZSkKIAogICAgIGRlZiBoYW5kbGVfc3RvcChz ZWxmLCBzcmMpOgotICAgICAgICBzZWxmLl9kb25lID0gVHJ1ZQorICAgICAgICBzZWxmLnN0b3Bf aGFuZGxpbmdfbWVzc2FnZXMoKQogCiAgICAgZGVmIF9ydW5fdGVzdChzZWxmLCB0ZXN0X2lucHV0 KToKICAgICAgICAgdGVzdF90aW1lb3V0X3NlYyA9IHNlbGYudGltZW91dCh0ZXN0X2lucHV0KQo= 127311 2012-02-15 22:31:51 -0800 2012-02-15 23:06:49 -0800 merge to r107884 bug-78181-20120215223150.patch text/plain 6778 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3ODg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2M3ZTkxZDczOGZhNmU2NDlmZTgxYjBmYzQxZTQyYjU1 YTY5MDZhYi4uZmUzODZiZDhhOGE5Yzc3YTJkNWM4ZTQzZmE0OGU0NWU1ZDY1M2VmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTAyLTE1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IHNpbXBsaWZ5IHdvcmtlciBpbnRlcmZhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4MTgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgbW92ZXMgY29kZSBpbiBu YW1lKCksIGlzX2RvbmUoKSwgcnVuKCksIGFuZCBjYW5jZWwoKQorICAgICAgICBmcm9tIFdvcmtl ciB0byBBYnN0cmFjdFdvcmtlciwgc2luY2UgdGhlIGxvZ2ljIGlzIHByZXR0eSBtdWNoCisgICAg ICAgIGJvaWxlcnBsYXRlIGNvZGUgdGhhdCBhbnkgaW1wbGVtZW50YXRpb24gd291bGQgd2FudCB0 byB1c2UuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHk6CisgICAgICAgIChnZXQuc2hvdWxkKToKKyAg ICAgICAgKEFic3RyYWN0V29ya2VyLl9faW5pdF9fKToKKyAgICAgICAgKEFic3RyYWN0V29ya2Vy KToKKyAgICAgICAgKEFic3RyYWN0V29ya2VyLm5hbWUpOgorICAgICAgICAoQWJzdHJhY3RXb3Jr ZXIuc3RvcF9oYW5kbGluZ19tZXNzYWdlcyk6CisgICAgICAgIChBYnN0cmFjdFdvcmtlci5ydW4p OgorICAgICAgICAoQWJzdHJhY3RXb3JrZXIuaXNfZG9uZSk6CisgICAgICAgIChBYnN0cmFjdFdv cmtlci5jYW5jZWwpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL3dvcmtlci5weToKKyAgICAgICAgKFdvcmtlci5fX2luaXRfXyk6CisgICAgICAg IChXb3JrZXIucnVuKToKKyAgICAgICAgKFdvcmtlci5oYW5kbGVfc3RvcCk6CisKIDIwMTItMDIt MTUgIExlbyBZYW5nICA8bGVvLnlhbmdAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIEJ1 aWxkIGZpeCBhZnRlciByMTA3ODYzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3Jr ZXJfYnJva2VyLnB5CmluZGV4IGE2ODJjZjQ1NThiZmIxZDk1MGUxOWM5NThiMzgzMjE4MzlkMTc0 ZDEuLjVlMWY5YjZjYzY5YTNjZmRkMzQ3NDgxZDJiNTNiYmU1YjQxN2U4MWUgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJf d29ya2VyX2Jyb2tlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkKQEAgLTY2LDcgKzY2LDcgQEAg ZGVmIGdldCh3b3JrZXJfbW9kZWwsIGNsaWVudCwgd29ya2VyX2NsYXNzKToKICAgICAgICAgd29y a2VyX21vZGVsIC0gY29uY3VycmVuY3kgbW9kZWwgdG8gdXNlIChpbmxpbmUvcHJvY2Vzc2VzKQog ICAgICAgICBjbGllbnQgLSBtZXNzYWdlX2Jyb2tlci5Ccm9rZXJDbGllbnQgaW1wbGVtZW50YXRp b24gdG8gZGlzcGF0Y2gKICAgICAgICAgICAgIHJlcGxpZXMgdG8uCi0gICAgICAgIHdvcmtlcl9j bGFzcyAtIHR5cGUgb2Ygd29ya2VycyB0byBjcmVhdGUuIFRoaXMgY2xhc3MgbXVzdCBpbXBsZW1l bnQKKyAgICAgICAgd29ya2VyX2NsYXNzIC0gdHlwZSBvZiB3b3JrZXJzIHRvIGNyZWF0ZS4gVGhp cyBjbGFzcyBzaG91bGQgb3ZlcnJpZGUKICAgICAgICAgICAgIHRoZSBtZXRob2RzIGluIEFic3Ry YWN0V29ya2VyLgogICAgIFJldHVybnM6CiAgICAgICAgIEEgaGFuZGxlIHRvIGFuIG9iamVjdCB0 aGF0IHdpbGwgdGFsayB0byBhIG1lc3NhZ2UgYnJva2VyIGNvbmZpZ3VyZWQKQEAgLTk5LDE3ICs5 OSw0NCBAQCBjbGFzcyBBYnN0cmFjdFdvcmtlcihtZXNzYWdlX2Jyb2tlci5Ccm9rZXJDbGllbnQp OgogICAgICAgICAgICAgd29ya2VyX2FyZ3VtZW50cyAtIChvcHRpb25hbCwgUGlja2xhYmxlKSBv YmplY3QgcGFzc2VkIHRvIHRoZSB3b3JrZXIgZnJvbSB0aGUgbWFuYWdlciIiIgogICAgICAgICBt ZXNzYWdlX2Jyb2tlci5Ccm9rZXJDbGllbnQuX19pbml0X18oc2VsZikKICAgICAgICAgc2VsZi5f d29ya2VyX2Nvbm5lY3Rpb24gPSB3b3JrZXJfY29ubmVjdGlvbgorICAgICAgICBzZWxmLl9uYW1l ID0gJ3dvcmtlcicKKyAgICAgICAgc2VsZi5fZG9uZSA9IEZhbHNlCisgICAgICAgIHNlbGYuX2Nh bmNlbGVkID0gRmFsc2UKKworICAgIGRlZiBuYW1lKHNlbGYpOgorICAgICAgICByZXR1cm4gc2Vs Zi5fbmFtZQorCisgICAgZGVmIGlzX2RvbmUoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9k b25lIG9yIHNlbGYuX2NhbmNlbGVkCisKKyAgICBkZWYgc3RvcF9oYW5kbGluZ19tZXNzYWdlcyhz ZWxmKToKKyAgICAgICAgc2VsZi5fZG9uZSA9IFRydWUKIAogICAgIGRlZiBydW4oc2VsZik6CiAg ICAgICAgICIiIkNhbGxiYWNrIGZvciB0aGUgd29ya2VyIHRvIHN0YXJ0IGV4ZWN1dGluZy4gVHlw aWNhbGx5IGRvZXMgYW55CiAgICAgICAgIHJlbWFpbmluZyBpbml0aWFsaXphdGlvbiBhbmQgdGhl biBjYWxscyBicm9rZXJfY29ubmVjdGlvbi5ydW5fbWVzc2FnZV9sb29wKCkuIiIiCi0gICAgICAg IHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IKKyAgICAgICAgZXhjZXB0aW9uX21zZyA9ICIiCisg ICAgICAgIF9sb2cuZGVidWcoIiVzIHN0YXJ0aW5nIiAlIHNlbGYuX25hbWUpCisKKyAgICAgICAg dHJ5OgorICAgICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucnVuX21lc3NhZ2VfbG9v cCgpCisgICAgICAgICAgICBpZiBub3Qgc2VsZi5pc19kb25lKCk6CisgICAgICAgICAgICAgICAg cmFpc2UgQXNzZXJ0aW9uRXJyb3IoIiVzOiByYW4gb3V0IG9mIG1lc3NhZ2VzIGluIHdvcmtlciBx dWV1ZS4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSBzZWxmLl9uYW1l KQorICAgICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CisgICAgICAgICAgICBleGNlcHRp b25fbXNnID0gIiwgaW50ZXJydXB0ZWQiCisgICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVj dGlvbi5yYWlzZV9leGNlcHRpb24oc3lzLmV4Y19pbmZvKCkpCisgICAgICAgIGV4Y2VwdDoKKyAg ICAgICAgICAgIGV4Y2VwdGlvbl9tc2cgPSAiLCBleGNlcHRpb24gcmFpc2VkIgorICAgICAgICAg ICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucmFpc2VfZXhjZXB0aW9uKHN5cy5leGNfaW5mbygp KQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgZG9uZSB3aXRo IG1lc3NhZ2UgbG9vcCVzIiAlIChzZWxmLl9uYW1lLCBleGNlcHRpb25fbXNnKSkKIAogICAgIGRl ZiBjYW5jZWwoc2VsZik6CiAgICAgICAgICIiIkNhbGxlZCB3aGVuIHBvc3NpYmxlIHRvIGluZGlj YXRlIHRvIHRoZSB3b3JrZXIgdG8gc3RvcCBwcm9jZXNzaW5nCiAgICAgICAgIG1lc3NhZ2VzIGFu ZCBzaHV0IGRvd24uIE5vdGUgdGhhdCB3b3JrZXJzIG1heSBiZSBzdG9wcGVkIHdpdGhvdXQgdGhp cwogICAgICAgICBtZXRob2QgYmVpbmcgY2FsbGVkLCBzbyBjbGllbnRzIHNob3VsZCBub3QgcmVs eSBzb2xlbHkgb24gdGhpcy4iIiIKLSAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgor ICAgICAgICBzZWxmLl9jYW5jZWxlZCA9IFRydWUKIAogCiBjbGFzcyBfTWFuYWdlckNvbm5lY3Rp b24obWVzc2FnZV9icm9rZXIuQnJva2VyQ29ubmVjdGlvbik6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkKaW5k ZXggOTgxYjViNmUxYTVhMDVjM2VkNzFmZWYwNTMyMjdmN2ZlZWM3YjRmMC4uMjJjMGE1ZjA0MjMx MDVlMzA5MzhiOGVmMzUyN2RjNjdlMjAyOWFhMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weQpAQCAtNTgs OCArNTgsNiBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2VyLkFic3RyYWN0V29y a2VyKToKICAgICAgICAgc2VsZi5fbmFtZSA9ICd3b3JrZXIvJWQnICUgc2VsZi5fd29ya2VyX251 bWJlcgogICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSA9IHdvcmtlcl9hcmd1bWVudHMu cmVzdWx0c19kaXJlY3RvcnkKICAgICAgICAgc2VsZi5fb3B0aW9ucyA9IHdvcmtlcl9hcmd1bWVu dHMub3B0aW9ucwotICAgICAgICBzZWxmLl9kb25lID0gRmFsc2UKLSAgICAgICAgc2VsZi5fY2Fu Y2VsZWQgPSBGYWxzZQogICAgICAgICBzZWxmLl9wb3J0ID0gTm9uZQogICAgICAgICBzZWxmLl9i YXRjaF9zaXplID0gTm9uZQogICAgICAgICBzZWxmLl9iYXRjaF9jb3VudCA9IE5vbmUKQEAgLTg0 LDE2ICs4Miw2IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RX b3JrZXIpOgogICAgICAgICB0ZXN0c19ydW5fZmlsZW5hbWUgPSBzZWxmLl9maWxlc3lzdGVtLmpv aW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJ0ZXN0c19ydW4lZC50eHQiICUgc2VsZi5fd29y a2VyX251bWJlcikKICAgICAgICAgc2VsZi5fdGVzdHNfcnVuX2ZpbGUgPSBzZWxmLl9maWxlc3lz dGVtLm9wZW5fdGV4dF9maWxlX2Zvcl93cml0aW5nKHRlc3RzX3J1bl9maWxlbmFtZSkKIAotICAg IGRlZiBjYW5jZWwoc2VsZik6Ci0gICAgICAgICIiIkF0dGVtcHQgdG8gYWJvcnQgcHJvY2Vzc2lu ZyAoYmVzdCBlZmZvcnQpLiIiIgotICAgICAgICBzZWxmLl9jYW5jZWxlZCA9IFRydWUKLQotICAg IGRlZiBpc19kb25lKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5fZG9uZSBvciBzZWxmLl9j YW5jZWxlZAotCi0gICAgZGVmIG5hbWUoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9uYW1l Ci0KICAgICBkZWYgc2V0X2lubGluZV9hcmd1bWVudHMoc2VsZiwgcG9ydCk6CiAgICAgICAgIHNl bGYuX3BvcnQgPSBwb3J0CiAKQEAgLTEyMiwyMiArMTEwLDEwIEBAIGNsYXNzIFdvcmtlcihtYW5h Z2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogCiAgICAgICAgIHNlbGYuc2FmZV9p bml0KCkKIAotICAgICAgICBleGNlcHRpb25fbXNnID0gIiIKLSAgICAgICAgX2xvZy5kZWJ1Zygi JXMgc3RhcnRpbmciICUgc2VsZi5fbmFtZSkKLQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBz ZWxmLl93b3JrZXJfY29ubmVjdGlvbi5ydW5fbWVzc2FnZV9sb29wKCkKLSAgICAgICAgICAgIGlm IG5vdCBzZWxmLmlzX2RvbmUoKToKLSAgICAgICAgICAgICAgICByYWlzZSBBc3NlcnRpb25FcnJv cigiJXM6IHJhbiBvdXQgb2YgbWVzc2FnZXMgaW4gd29ya2VyIHF1ZXVlLiIKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAlIHNlbGYuX25hbWUpCi0gICAgICAgIGV4Y2VwdCBL ZXlib2FyZEludGVycnVwdDoKLSAgICAgICAgICAgIGV4Y2VwdGlvbl9tc2cgPSAiLCBpbnRlcnJ1 cHRlZCIKLSAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnJhaXNlX2V4Y2VwdGlv bihzeXMuZXhjX2luZm8oKSkKLSAgICAgICAgZXhjZXB0OgotICAgICAgICAgICAgZXhjZXB0aW9u X21zZyA9ICIsIGV4Y2VwdGlvbiByYWlzZWQiCi0gICAgICAgICAgICBzZWxmLl93b3JrZXJfY29u bmVjdGlvbi5yYWlzZV9leGNlcHRpb24oc3lzLmV4Y19pbmZvKCkpCisgICAgICAgICAgICBfbG9n LmRlYnVnKCIlcyBzdGFydGluZyIgJSBzZWxmLl9uYW1lKQorICAgICAgICAgICAgc3VwZXIoV29y a2VyLCBzZWxmKS5ydW4oKQogICAgICAgICBmaW5hbGx5OgotICAgICAgICAgICAgX2xvZy5kZWJ1 ZygiJXMgZG9uZSB3aXRoIG1lc3NhZ2UgbG9vcCVzIiAlIChzZWxmLl9uYW1lLCBleGNlcHRpb25f bXNnKSkKICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnBvc3RfbWVzc2FnZSgn ZG9uZScpCiAgICAgICAgICAgICBzZWxmLmNsZWFudXAoKQogICAgICAgICAgICAgX2xvZy5kZWJ1 ZygiJXMgZXhpdGluZyIgJSBzZWxmLl9uYW1lKQpAQCAtMTU3LDcgKzEzMyw3IEBAIGNsYXNzIFdv cmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICBzZWxm Ll93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2ZpbmlzaGVkX2xpc3QnLCBsaXN0X25h bWUsIG51bV90ZXN0cywgZWxhcHNlZF90aW1lKQogCiAgICAgZGVmIGhhbmRsZV9zdG9wKHNlbGYs IHNyYyk6Ci0gICAgICAgIHNlbGYuX2RvbmUgPSBUcnVlCisgICAgICAgIHNlbGYuc3RvcF9oYW5k bGluZ19tZXNzYWdlcygpCiAKICAgICBkZWYgX3J1bl90ZXN0KHNlbGYsIHRlc3RfaW5wdXQpOgog ICAgICAgICB0ZXN0X3RpbWVvdXRfc2VjID0gc2VsZi50aW1lb3V0KHRlc3RfaW5wdXQpCg== 127314 2012-02-15 23:06:55 -0800 2012-02-16 10:21:30 -0800 fix indentation bug-78181-20120215230653.patch text/plain 7009 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3ODg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2M3ZTkxZDczOGZhNmU2NDlmZTgxYjBmYzQxZTQyYjU1 YTY5MDZhYi4uZmUzODZiZDhhOGE5Yzc3YTJkNWM4ZTQzZmE0OGU0NWU1ZDY1M2VmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTAyLTE1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IHNpbXBsaWZ5IHdvcmtlciBpbnRlcmZhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4MTgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgbW92ZXMgY29kZSBpbiBu YW1lKCksIGlzX2RvbmUoKSwgcnVuKCksIGFuZCBjYW5jZWwoKQorICAgICAgICBmcm9tIFdvcmtl ciB0byBBYnN0cmFjdFdvcmtlciwgc2luY2UgdGhlIGxvZ2ljIGlzIHByZXR0eSBtdWNoCisgICAg ICAgIGJvaWxlcnBsYXRlIGNvZGUgdGhhdCBhbnkgaW1wbGVtZW50YXRpb24gd291bGQgd2FudCB0 byB1c2UuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHk6CisgICAgICAgIChnZXQuc2hvdWxkKToKKyAg ICAgICAgKEFic3RyYWN0V29ya2VyLl9faW5pdF9fKToKKyAgICAgICAgKEFic3RyYWN0V29ya2Vy KToKKyAgICAgICAgKEFic3RyYWN0V29ya2VyLm5hbWUpOgorICAgICAgICAoQWJzdHJhY3RXb3Jr ZXIuc3RvcF9oYW5kbGluZ19tZXNzYWdlcyk6CisgICAgICAgIChBYnN0cmFjdFdvcmtlci5ydW4p OgorICAgICAgICAoQWJzdHJhY3RXb3JrZXIuaXNfZG9uZSk6CisgICAgICAgIChBYnN0cmFjdFdv cmtlci5jYW5jZWwpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL3dvcmtlci5weToKKyAgICAgICAgKFdvcmtlci5fX2luaXRfXyk6CisgICAgICAg IChXb3JrZXIucnVuKToKKyAgICAgICAgKFdvcmtlci5oYW5kbGVfc3RvcCk6CisKIDIwMTItMDIt MTUgIExlbyBZYW5nICA8bGVvLnlhbmdAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIEJ1 aWxkIGZpeCBhZnRlciByMTA3ODYzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3Jr ZXJfYnJva2VyLnB5CmluZGV4IGE2ODJjZjQ1NThiZmIxZDk1MGUxOWM5NThiMzgzMjE4MzlkMTc0 ZDEuLjUzNWJkMzBiNjc2ZGRhMmI5YWY5ODJkMzgyOGNkMzJkNTRlNWJjM2YgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJf d29ya2VyX2Jyb2tlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkKQEAgLTY2LDEyICs2NiwxMSBA QCBkZWYgZ2V0KHdvcmtlcl9tb2RlbCwgY2xpZW50LCB3b3JrZXJfY2xhc3MpOgogICAgICAgICB3 b3JrZXJfbW9kZWwgLSBjb25jdXJyZW5jeSBtb2RlbCB0byB1c2UgKGlubGluZS9wcm9jZXNzZXMp CiAgICAgICAgIGNsaWVudCAtIG1lc3NhZ2VfYnJva2VyLkJyb2tlckNsaWVudCBpbXBsZW1lbnRh dGlvbiB0byBkaXNwYXRjaAogICAgICAgICAgICAgcmVwbGllcyB0by4KLSAgICAgICAgd29ya2Vy X2NsYXNzIC0gdHlwZSBvZiB3b3JrZXJzIHRvIGNyZWF0ZS4gVGhpcyBjbGFzcyBtdXN0IGltcGxl bWVudAorICAgICAgICB3b3JrZXJfY2xhc3MgLSB0eXBlIG9mIHdvcmtlcnMgdG8gY3JlYXRlLiBU aGlzIGNsYXNzIHNob3VsZCBvdmVycmlkZQogICAgICAgICAgICAgdGhlIG1ldGhvZHMgaW4gQWJz dHJhY3RXb3JrZXIuCiAgICAgUmV0dXJuczoKICAgICAgICAgQSBoYW5kbGUgdG8gYW4gb2JqZWN0 IHRoYXQgd2lsbCB0YWxrIHRvIGEgbWVzc2FnZSBicm9rZXIgY29uZmlndXJlZAotICAgICAgICBm b3IgdGhlIG5vcm1hbCBtYW5hZ2VyL3dvcmtlciBjb21tdW5pY2F0aW9uLgotICAgICIiIgorICAg ICAgICBmb3IgdGhlIG5vcm1hbCBtYW5hZ2VyL3dvcmtlciBjb21tdW5pY2F0aW9uLiIiIgogICAg IGlmIHdvcmtlcl9tb2RlbCA9PSAnaW5saW5lJzoKICAgICAgICAgcXVldWVfY2xhc3MgPSBRdWV1 ZS5RdWV1ZQogICAgICAgICBtYW5hZ2VyX2NsYXNzID0gX0lubGluZU1hbmFnZXIKQEAgLTk5LDE3 ICs5OCw0NCBAQCBjbGFzcyBBYnN0cmFjdFdvcmtlcihtZXNzYWdlX2Jyb2tlci5Ccm9rZXJDbGll bnQpOgogICAgICAgICAgICAgd29ya2VyX2FyZ3VtZW50cyAtIChvcHRpb25hbCwgUGlja2xhYmxl KSBvYmplY3QgcGFzc2VkIHRvIHRoZSB3b3JrZXIgZnJvbSB0aGUgbWFuYWdlciIiIgogICAgICAg ICBtZXNzYWdlX2Jyb2tlci5Ccm9rZXJDbGllbnQuX19pbml0X18oc2VsZikKICAgICAgICAgc2Vs Zi5fd29ya2VyX2Nvbm5lY3Rpb24gPSB3b3JrZXJfY29ubmVjdGlvbgorICAgICAgICBzZWxmLl9u YW1lID0gJ3dvcmtlcicKKyAgICAgICAgc2VsZi5fZG9uZSA9IEZhbHNlCisgICAgICAgIHNlbGYu X2NhbmNlbGVkID0gRmFsc2UKKworICAgIGRlZiBuYW1lKHNlbGYpOgorICAgICAgICByZXR1cm4g c2VsZi5fbmFtZQorCisgICAgZGVmIGlzX2RvbmUoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxm Ll9kb25lIG9yIHNlbGYuX2NhbmNlbGVkCisKKyAgICBkZWYgc3RvcF9oYW5kbGluZ19tZXNzYWdl cyhzZWxmKToKKyAgICAgICAgc2VsZi5fZG9uZSA9IFRydWUKIAogICAgIGRlZiBydW4oc2VsZik6 CiAgICAgICAgICIiIkNhbGxiYWNrIGZvciB0aGUgd29ya2VyIHRvIHN0YXJ0IGV4ZWN1dGluZy4g VHlwaWNhbGx5IGRvZXMgYW55CiAgICAgICAgIHJlbWFpbmluZyBpbml0aWFsaXphdGlvbiBhbmQg dGhlbiBjYWxscyBicm9rZXJfY29ubmVjdGlvbi5ydW5fbWVzc2FnZV9sb29wKCkuIiIiCi0gICAg ICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IKKyAgICAgICAgZXhjZXB0aW9uX21zZyA9ICIi CisgICAgICAgIF9sb2cuZGVidWcoIiVzIHN0YXJ0aW5nIiAlIHNlbGYuX25hbWUpCisKKyAgICAg ICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucnVuX21lc3NhZ2Vf bG9vcCgpCisgICAgICAgICAgICBpZiBub3Qgc2VsZi5pc19kb25lKCk6CisgICAgICAgICAgICAg ICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoIiVzOiByYW4gb3V0IG9mIG1lc3NhZ2VzIGluIHdvcmtl ciBxdWV1ZS4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSBzZWxmLl9u YW1lKQorICAgICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CisgICAgICAgICAgICBleGNl cHRpb25fbXNnID0gIiwgaW50ZXJydXB0ZWQiCisgICAgICAgICAgICBzZWxmLl93b3JrZXJfY29u bmVjdGlvbi5yYWlzZV9leGNlcHRpb24oc3lzLmV4Y19pbmZvKCkpCisgICAgICAgIGV4Y2VwdDoK KyAgICAgICAgICAgIGV4Y2VwdGlvbl9tc2cgPSAiLCBleGNlcHRpb24gcmFpc2VkIgorICAgICAg ICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucmFpc2VfZXhjZXB0aW9uKHN5cy5leGNfaW5m bygpKQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgZG9uZSB3 aXRoIG1lc3NhZ2UgbG9vcCVzIiAlIChzZWxmLl9uYW1lLCBleGNlcHRpb25fbXNnKSkKIAogICAg IGRlZiBjYW5jZWwoc2VsZik6CiAgICAgICAgICIiIkNhbGxlZCB3aGVuIHBvc3NpYmxlIHRvIGlu ZGljYXRlIHRvIHRoZSB3b3JrZXIgdG8gc3RvcCBwcm9jZXNzaW5nCiAgICAgICAgIG1lc3NhZ2Vz IGFuZCBzaHV0IGRvd24uIE5vdGUgdGhhdCB3b3JrZXJzIG1heSBiZSBzdG9wcGVkIHdpdGhvdXQg dGhpcwogICAgICAgICBtZXRob2QgYmVpbmcgY2FsbGVkLCBzbyBjbGllbnRzIHNob3VsZCBub3Qg cmVseSBzb2xlbHkgb24gdGhpcy4iIiIKLSAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJv cgorICAgICAgICBzZWxmLl9jYW5jZWxlZCA9IFRydWUKIAogCiBjbGFzcyBfTWFuYWdlckNvbm5l Y3Rpb24obWVzc2FnZV9icm9rZXIuQnJva2VyQ29ubmVjdGlvbik6CmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkK aW5kZXggOTgxYjViNmUxYTVhMDVjM2VkNzFmZWYwNTMyMjdmN2ZlZWM3YjRmMC4uMjJjMGE1ZjA0 MjMxMDVlMzA5MzhiOGVmMzUyN2RjNjdlMjAyOWFhMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weQpAQCAt NTgsOCArNTgsNiBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2VyLkFic3RyYWN0 V29ya2VyKToKICAgICAgICAgc2VsZi5fbmFtZSA9ICd3b3JrZXIvJWQnICUgc2VsZi5fd29ya2Vy X251bWJlcgogICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSA9IHdvcmtlcl9hcmd1bWVu dHMucmVzdWx0c19kaXJlY3RvcnkKICAgICAgICAgc2VsZi5fb3B0aW9ucyA9IHdvcmtlcl9hcmd1 bWVudHMub3B0aW9ucwotICAgICAgICBzZWxmLl9kb25lID0gRmFsc2UKLSAgICAgICAgc2VsZi5f Y2FuY2VsZWQgPSBGYWxzZQogICAgICAgICBzZWxmLl9wb3J0ID0gTm9uZQogICAgICAgICBzZWxm Ll9iYXRjaF9zaXplID0gTm9uZQogICAgICAgICBzZWxmLl9iYXRjaF9jb3VudCA9IE5vbmUKQEAg LTg0LDE2ICs4Miw2IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJh Y3RXb3JrZXIpOgogICAgICAgICB0ZXN0c19ydW5fZmlsZW5hbWUgPSBzZWxmLl9maWxlc3lzdGVt LmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJ0ZXN0c19ydW4lZC50eHQiICUgc2VsZi5f d29ya2VyX251bWJlcikKICAgICAgICAgc2VsZi5fdGVzdHNfcnVuX2ZpbGUgPSBzZWxmLl9maWxl c3lzdGVtLm9wZW5fdGV4dF9maWxlX2Zvcl93cml0aW5nKHRlc3RzX3J1bl9maWxlbmFtZSkKIAot ICAgIGRlZiBjYW5jZWwoc2VsZik6Ci0gICAgICAgICIiIkF0dGVtcHQgdG8gYWJvcnQgcHJvY2Vz c2luZyAoYmVzdCBlZmZvcnQpLiIiIgotICAgICAgICBzZWxmLl9jYW5jZWxlZCA9IFRydWUKLQot ICAgIGRlZiBpc19kb25lKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5fZG9uZSBvciBzZWxm Ll9jYW5jZWxlZAotCi0gICAgZGVmIG5hbWUoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9u YW1lCi0KICAgICBkZWYgc2V0X2lubGluZV9hcmd1bWVudHMoc2VsZiwgcG9ydCk6CiAgICAgICAg IHNlbGYuX3BvcnQgPSBwb3J0CiAKQEAgLTEyMiwyMiArMTEwLDEwIEBAIGNsYXNzIFdvcmtlciht YW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogCiAgICAgICAgIHNlbGYuc2Fm ZV9pbml0KCkKIAotICAgICAgICBleGNlcHRpb25fbXNnID0gIiIKLSAgICAgICAgX2xvZy5kZWJ1 ZygiJXMgc3RhcnRpbmciICUgc2VsZi5fbmFtZSkKLQogICAgICAgICB0cnk6Ci0gICAgICAgICAg ICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5ydW5fbWVzc2FnZV9sb29wKCkKLSAgICAgICAgICAg IGlmIG5vdCBzZWxmLmlzX2RvbmUoKToKLSAgICAgICAgICAgICAgICByYWlzZSBBc3NlcnRpb25F cnJvcigiJXM6IHJhbiBvdXQgb2YgbWVzc2FnZXMgaW4gd29ya2VyIHF1ZXVlLiIKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAlIHNlbGYuX25hbWUpCi0gICAgICAgIGV4Y2Vw dCBLZXlib2FyZEludGVycnVwdDoKLSAgICAgICAgICAgIGV4Y2VwdGlvbl9tc2cgPSAiLCBpbnRl cnJ1cHRlZCIKLSAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnJhaXNlX2V4Y2Vw dGlvbihzeXMuZXhjX2luZm8oKSkKLSAgICAgICAgZXhjZXB0OgotICAgICAgICAgICAgZXhjZXB0 aW9uX21zZyA9ICIsIGV4Y2VwdGlvbiByYWlzZWQiCi0gICAgICAgICAgICBzZWxmLl93b3JrZXJf Y29ubmVjdGlvbi5yYWlzZV9leGNlcHRpb24oc3lzLmV4Y19pbmZvKCkpCisgICAgICAgICAgICBf bG9nLmRlYnVnKCIlcyBzdGFydGluZyIgJSBzZWxmLl9uYW1lKQorICAgICAgICAgICAgc3VwZXIo V29ya2VyLCBzZWxmKS5ydW4oKQogICAgICAgICBmaW5hbGx5OgotICAgICAgICAgICAgX2xvZy5k ZWJ1ZygiJXMgZG9uZSB3aXRoIG1lc3NhZ2UgbG9vcCVzIiAlIChzZWxmLl9uYW1lLCBleGNlcHRp b25fbXNnKSkKICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnBvc3RfbWVzc2Fn ZSgnZG9uZScpCiAgICAgICAgICAgICBzZWxmLmNsZWFudXAoKQogICAgICAgICAgICAgX2xvZy5k ZWJ1ZygiJXMgZXhpdGluZyIgJSBzZWxmLl9uYW1lKQpAQCAtMTU3LDcgKzEzMyw3IEBAIGNsYXNz IFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICBz ZWxmLl93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2ZpbmlzaGVkX2xpc3QnLCBsaXN0 X25hbWUsIG51bV90ZXN0cywgZWxhcHNlZF90aW1lKQogCiAgICAgZGVmIGhhbmRsZV9zdG9wKHNl bGYsIHNyYyk6Ci0gICAgICAgIHNlbGYuX2RvbmUgPSBUcnVlCisgICAgICAgIHNlbGYuc3RvcF9o YW5kbGluZ19tZXNzYWdlcygpCiAKICAgICBkZWYgX3J1bl90ZXN0KHNlbGYsIHRlc3RfaW5wdXQp OgogICAgICAgICB0ZXN0X3RpbWVvdXRfc2VjID0gc2VsZi50aW1lb3V0KHRlc3RfaW5wdXQpCg==