155101 2016-03-06 17:07:46 -0800 Web Inspector: the protocol generator should have separate prefix options for Objective-C classes and filenames 2016-03-06 19:52:10 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg commit-queue graouts joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1171487 0 bburg 2016-03-06 17:07:46 -0800 The 'Automation' prefix currently used is redundant with the only domain, 'Automation'. 1171488 1 webkit-bug-importer 2016-03-06 17:07:59 -0800 <rdar://problem/25000053> 1171505 2 273159 bburg 2016-03-06 19:28:49 -0800 Created attachment 273159 Proposed Fix 1171507 3 commit-queue 2016-03-06 19:30:26 -0800 This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`) 1171508 4 commit-queue 2016-03-06 19:30:33 -0800 Attachment 273159 did not pass style-queue: ERROR: Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py:51: [ObjCConversionHelpersGenerator.output_filename] Instance of 'ObjCConversionHelpersGenerator' has no 'protocol_name' member [pylint/E1101] [5] ERROR: Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py:97: [ObjCGenerator.protocol_name] Instance of 'ObjCGenerator' has no 'model' member [pylint/E1101] [5] ERROR: Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py:103: [ObjCGenerator.objc_prefix] Instance of 'ObjCGenerator' has no 'model' member [pylint/E1101] [5] Total errors found: 3 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 1171512 5 bburg 2016-03-06 19:52:10 -0800 Committed r197658: <http://trac.webkit.org/changeset/197658> 273159 2016-03-06 19:28:49 -0800 2016-03-06 19:46:52 -0800 Proposed Fix bug-155101-20160306192835.patch text/plain 18016 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm OThkY2M0ZTZiOGFiMjQ4MDViZjA3MDE3ZDg5YWRmMmQ4MTU1ZTI0Li4yYmNkMTkwNmM4MTA1ZGMx MWNlMTIyNTQ1YzA5NGY4YTgxYzM2ODU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1MyBAQAorMjAxNi0wMy0wNiAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiB0aGUgcHJvdG9jb2wgZ2VuZXJhdG9yIHNob3VsZCBoYXZl IHNlcGFyYXRlIHByZWZpeCBvcHRpb25zIGZvciBPYmplY3RpdmUtQyBjbGFzc2VzIGFuZCBmaWxl bmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 NTEwMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjUwMDAwNTM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgc2hvdWxkIGJlIHBvc3NpYmxlIHRv IGdlbmVyYXRlIE9iamVjdGl2ZS1DIHByb3RvY29sIHR5cGVzIHdpdGhvdXQgcHJlZml4aW5nIGFs bCBjbGFzcyBuYW1lcy4KKyAgICAgICAgVGhlIHByZWZpeGVzIGFyZSBvbmx5IG5lY2Vzc2FyeSB3 aGVuIHRoZSBnZW5lcmF0ZWQgZmlsZXMgYXJlIHBhcnQgb2YgYSBmcmFtZXdvcmssIGJ1dCB0aGlz IGlzbid0CisgICAgICAgIGhvdyB0aGUgZ2VuZXJhdGVkIE9iamVjdGl2ZS1DIGZyb250ZW5kIGZp bGVzIGFyZSB1c2VkLgorCisgICAgICAgIEFkZCBhIHNlcGFyYXRlIGZyYW1ld29yayBzZXR0aW5n IGFuZCBzd2l0Y2ggb3ZlciBjb2RlIHRvIHVzZSB0aGUgJ3Byb3RvY29sX2dyb3VwJyBpbiBmaWxl bmFtZXMsCisgICAgICAgIGFuZCB0aGUgJ29iamNfcHJlZml4JyBmb3IgT2JqZWN0aXZlLUMgZW51 bSBhbmQgY2xhc3MgcHJlZml4ZXMuCisKKyAgICAgICAgTm8gdGVzdHMgbmVlZCB0byBiZSByZWJh c2VsaW5lZCBiZWNhdXNlIHRlc3RzIGFsd2F5cyBzZXQgdGhlIHByb3RvY29sX2dyb3VwIGFuZCBv YmpjX3ByZWZpeAorICAgICAgICB0byB0aGUgc2FtZSB2YWx1ZS4KKworICAgICAgICAqIGluc3Bl Y3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19iYWNrZW5kX2Rpc3BhdGNoZXJfaGVh ZGVyLnB5OgorICAgICAgICAoT2JqQ0JhY2tlbmREaXNwYXRjaGVySGVhZGVyR2VuZXJhdG9yLm91 dHB1dF9maWxlbmFtZSk6CisgICAgICAgICogaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5l cmF0ZV9vYmpjX2JhY2tlbmRfZGlzcGF0Y2hlcl9pbXBsZW1lbnRhdGlvbi5weToKKyAgICAgICAg KE9iakNDb25maWd1cmF0aW9uSW1wbGVtZW50YXRpb25HZW5lcmF0b3Iub3V0cHV0X2ZpbGVuYW1l KToKKyAgICAgICAgKE9iakNDb25maWd1cmF0aW9uSW1wbGVtZW50YXRpb25HZW5lcmF0b3IuZ2Vu ZXJhdGVfb3V0cHV0KToKKyAgICAgICAgKiBpbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVy YXRlX29iamNfY29uZmlndXJhdGlvbl9oZWFkZXIucHk6CisgICAgICAgIChPYmpDQ29uZmlndXJh dGlvbkhlYWRlckdlbmVyYXRvci5vdXRwdXRfZmlsZW5hbWUpOgorICAgICAgICAoT2JqQ0NvbmZp Z3VyYXRpb25IZWFkZXJHZW5lcmF0b3IuZ2VuZXJhdGVfb3V0cHV0KToKKyAgICAgICAgKE9iakND b25maWd1cmF0aW9uSGVhZGVyR2VuZXJhdG9yLl9nZW5lcmF0ZV9jb25maWd1cmF0aW9uX2ludGVy ZmFjZV9mb3JfZG9tYWlucyk6CisgICAgICAgICogaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9n ZW5lcmF0ZV9vYmpjX2NvbmZpZ3VyYXRpb25faW1wbGVtZW50YXRpb24ucHk6CisgICAgICAgIChP YmpDQmFja2VuZERpc3BhdGNoZXJJbXBsZW1lbnRhdGlvbkdlbmVyYXRvci5vdXRwdXRfZmlsZW5h bWUpOgorICAgICAgICAoT2JqQ0JhY2tlbmREaXNwYXRjaGVySW1wbGVtZW50YXRpb25HZW5lcmF0 b3IuZ2VuZXJhdGVfb3V0cHV0KToKKyAgICAgICAgKE9iakNCYWNrZW5kRGlzcGF0Y2hlckltcGxl bWVudGF0aW9uR2VuZXJhdG9yLl9nZW5lcmF0ZV9jb25maWd1cmF0aW9uX2ltcGxlbWVudGF0aW9u X2Zvcl9kb21haW5zKToKKyAgICAgICAgKiBpbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVy YXRlX29iamNfY29udmVyc2lvbl9oZWxwZXJzLnB5OgorICAgICAgICAoT2JqQ0NvbnZlcnNpb25I ZWxwZXJzR2VuZXJhdG9yLm91dHB1dF9maWxlbmFtZSk6CisgICAgICAgICogaW5zcGVjdG9yL3Nj cmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2Zyb250ZW5kX2Rpc3BhdGNoZXJfaW1wbGVtZW50 YXRpb24ucHk6CisgICAgICAgIChPYmpDRnJvbnRlbmREaXNwYXRjaGVySW1wbGVtZW50YXRpb25H ZW5lcmF0b3Iub3V0cHV0X2ZpbGVuYW1lKToKKyAgICAgICAgKE9iakNGcm9udGVuZERpc3BhdGNo ZXJJbXBsZW1lbnRhdGlvbkdlbmVyYXRvci5nZW5lcmF0ZV9vdXRwdXQpOgorICAgICAgICAqIGlu c3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19oZWFkZXIucHk6CisgICAgICAg IChPYmpDSGVhZGVyR2VuZXJhdG9yLm91dHB1dF9maWxlbmFtZSk6CisgICAgICAgICogaW5zcGVj dG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2ludGVybmFsX2hlYWRlci5weToKKyAg ICAgICAgKE9iakNJbnRlcm5hbEhlYWRlckdlbmVyYXRvci5vdXRwdXRfZmlsZW5hbWUpOgorICAg ICAgICAoT2JqQ0ludGVybmFsSGVhZGVyR2VuZXJhdG9yLmdlbmVyYXRlX291dHB1dCk6CisgICAg ICAgICogaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX3Byb3RvY29sX3R5 cGVzX2ltcGxlbWVudGF0aW9uLnB5OgorICAgICAgICAoT2JqQ1Byb3RvY29sVHlwZXNJbXBsZW1l bnRhdGlvbkdlbmVyYXRvci5vdXRwdXRfZmlsZW5hbWUpOgorICAgICAgICAoT2JqQ1Byb3RvY29s VHlwZXNJbXBsZW1lbnRhdGlvbkdlbmVyYXRvci5nZW5lcmF0ZV9vdXRwdXQpOgorICAgICAgICAq IGluc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vbW9kZWxzLnB5OgorICAgICAgICAqIGluc3BlY3Rv ci9zY3JpcHRzL2NvZGVnZW4vb2JqY19nZW5lcmF0b3IucHk6CisgICAgICAgIChPYmpDR2VuZXJh dG9yKToKKyAgICAgICAgKE9iakNHZW5lcmF0b3IucHJvdG9jb2xfbmFtZSk6CisgICAgICAgIChP YmpDR2VuZXJhdG9yLm9iamNfcHJlZml4KToKKwogMjAxNi0wMy0wNiAgQ29tbWl0IFF1ZXVlICA8 Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjE5NzY0NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv c2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX29iamNfYmFja2VuZF9kaXNwYXRjaGVyX2hlYWRlci5w eSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVy YXRlX29iamNfYmFja2VuZF9kaXNwYXRjaGVyX2hlYWRlci5weQppbmRleCAyMDMzMmEwMDlmYWE3 YzYyOTBmNjMyZTA5ODE2ZjYyNTlkZjIxMmEyLi5jNDNlNmZlZTk4Y2Q4NTMyYzY1Njk1MWU5NWQ0 NDU1NGM3ZjA5YTQ1IDEwMDc1NQotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2JhY2tlbmRfZGlzcGF0Y2hlcl9oZWFkZXIu cHkKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4v Z2VuZXJhdGVfb2JqY19iYWNrZW5kX2Rpc3BhdGNoZXJfaGVhZGVyLnB5CkBAIC00NCw3ICs0NCw3 IEBAIGNsYXNzIE9iakNCYWNrZW5kRGlzcGF0Y2hlckhlYWRlckdlbmVyYXRvcihPYmpDR2VuZXJh dG9yKToKICAgICAgICAgT2JqQ0dlbmVyYXRvci5fX2luaXRfXyhzZWxmLCBtb2RlbCwgaW5wdXRf ZmlsZXBhdGgpCiAKICAgICBkZWYgb3V0cHV0X2ZpbGVuYW1lKHNlbGYpOgotICAgICAgICByZXR1 cm4gJyVzQmFja2VuZERpc3BhdGNoZXJzLmgnICUgc2VsZi5vYmpjX3ByZWZpeCgpCisgICAgICAg IHJldHVybiAnJXNCYWNrZW5kRGlzcGF0Y2hlcnMuaCcgJSBzZWxmLnByb3RvY29sX25hbWUoKQog CiAgICAgZGVmIGRvbWFpbnNfdG9fZ2VuZXJhdGUoc2VsZik6CiAgICAgICAgIHJldHVybiBmaWx0 ZXIoT2JqQ0dlbmVyYXRvci5zaG91bGRfZ2VuZXJhdGVfZG9tYWluX2NvbW1hbmRfaGFuZGxlcl9m aWx0ZXIoc2VsZi5tb2RlbCgpKSwgR2VuZXJhdG9yLmRvbWFpbnNfdG9fZ2VuZXJhdGUoc2VsZikp CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29k ZWdlbi9nZW5lcmF0ZV9vYmpjX2JhY2tlbmRfZGlzcGF0Y2hlcl9pbXBsZW1lbnRhdGlvbi5weSBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRl X29iamNfYmFja2VuZF9kaXNwYXRjaGVyX2ltcGxlbWVudGF0aW9uLnB5CmluZGV4IGRiYzdhYmEz MDQ1N2U4OWVmZWVjOGRhZjk4MjJlYjJiOTNkMmJhOTQuLjIxZmUzYTU3MzAxMzc1NTY0MzY0MzQ1 NjFlYThlZjBiNTc2YWRjMzggMTAwNzU1Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX29iamNfYmFja2VuZF9kaXNwYXRjaGVyX2lt cGxlbWVudGF0aW9uLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2Ny aXB0cy9jb2RlZ2VuL2dlbmVyYXRlX29iamNfYmFja2VuZF9kaXNwYXRjaGVyX2ltcGxlbWVudGF0 aW9uLnB5CkBAIC00NCwyMCArNDQsMjAgQEAgY2xhc3MgT2JqQ0NvbmZpZ3VyYXRpb25JbXBsZW1l bnRhdGlvbkdlbmVyYXRvcihPYmpDR2VuZXJhdG9yKToKICAgICAgICAgT2JqQ0dlbmVyYXRvci5f X2luaXRfXyhzZWxmLCBtb2RlbCwgaW5wdXRfZmlsZXBhdGgpCiAKICAgICBkZWYgb3V0cHV0X2Zp bGVuYW1lKHNlbGYpOgotICAgICAgICByZXR1cm4gJyVzQmFja2VuZERpc3BhdGNoZXJzLm1tJyAl IHNlbGYub2JqY19wcmVmaXgoKQorICAgICAgICByZXR1cm4gJyVzQmFja2VuZERpc3BhdGNoZXJz Lm1tJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgpCiAKICAgICBkZWYgZG9tYWluc190b19nZW5lcmF0 ZShzZWxmKToKICAgICAgICAgcmV0dXJuIGZpbHRlcihPYmpDR2VuZXJhdG9yLnNob3VsZF9nZW5l cmF0ZV9kb21haW5fY29tbWFuZF9oYW5kbGVyX2ZpbHRlcihzZWxmLm1vZGVsKCkpLCBHZW5lcmF0 b3IuZG9tYWluc190b19nZW5lcmF0ZShzZWxmKSkKIAogICAgIGRlZiBnZW5lcmF0ZV9vdXRwdXQo c2VsZik6CiAgICAgICAgIHNlY29uZGFyeV9oZWFkZXJzID0gWwotICAgICAgICAgICAgJyIlc0lu dGVybmFsLmgiJyAlIHNlbGYub2JqY19wcmVmaXgoKSwKLSAgICAgICAgICAgICciJXNFbnVtQ29u dmVyc2lvbkhlbHBlcnMuaCInICUgc2VsZi5vYmpjX3ByZWZpeCgpLAorICAgICAgICAgICAgJyIl c0ludGVybmFsLmgiJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgpLAorICAgICAgICAgICAgJyIlc0Vu dW1Db252ZXJzaW9uSGVscGVycy5oIicgJSBzZWxmLnByb3RvY29sX25hbWUoKSwKICAgICAgICAg ICAgICc8SmF2YVNjcmlwdENvcmUvSW5zcGVjdG9yVmFsdWVzLmg+JywKICAgICAgICAgXQogCiAg ICAgICAgIGhlYWRlcl9hcmdzID0gewotICAgICAgICAgICAgJ3ByaW1hcnlJbmNsdWRlJzogJyIl c0JhY2tlbmREaXNwYXRjaGVycy5oIicgJSBzZWxmLm9iamNfcHJlZml4KCksCisgICAgICAgICAg ICAncHJpbWFyeUluY2x1ZGUnOiAnIiVzQmFja2VuZERpc3BhdGNoZXJzLmgiJyAlIHNlbGYucHJv dG9jb2xfbmFtZSgpLAogICAgICAgICAgICAgJ3NlY29uZGFyeUluY2x1ZGVzJzogJ1xuJy5qb2lu KFsnI2luY2x1ZGUgJXMnICUgaGVhZGVyIGZvciBoZWFkZXIgaW4gc2Vjb25kYXJ5X2hlYWRlcnNd KSwKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2NvbmZpZ3VyYXRpb25faGVhZGVyLnB5 IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJh dGVfb2JqY19jb25maWd1cmF0aW9uX2hlYWRlci5weQppbmRleCA0MWY5MjdkMDM2MmIwMTAxODQ3 NjE1YzRhN2IzMzdmMDEyY2M2NjMzLi41ZTljOWUwMDA4MzgyOTY1M2M3MmQxZDIyN2ViNGQyYTA5 OGUzM2NiIDEwMDc1NQotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Njcmlw dHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2NvbmZpZ3VyYXRpb25faGVhZGVyLnB5CisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX29i amNfY29uZmlndXJhdGlvbl9oZWFkZXIucHkKQEAgLTQxLDExICs0MSwxMSBAQCBjbGFzcyBPYmpD Q29uZmlndXJhdGlvbkhlYWRlckdlbmVyYXRvcihPYmpDR2VuZXJhdG9yKToKICAgICAgICAgT2Jq Q0dlbmVyYXRvci5fX2luaXRfXyhzZWxmLCBtb2RlbCwgaW5wdXRfZmlsZXBhdGgpCiAKICAgICBk ZWYgb3V0cHV0X2ZpbGVuYW1lKHNlbGYpOgotICAgICAgICByZXR1cm4gJyVzQ29uZmlndXJhdGlv bi5oJyAlIHNlbGYub2JqY19wcmVmaXgoKQorICAgICAgICByZXR1cm4gJyVzQ29uZmlndXJhdGlv bi5oJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgpCiAKICAgICBkZWYgZ2VuZXJhdGVfb3V0cHV0KHNl bGYpOgogICAgICAgICBoZWFkZXJzID0gWwotICAgICAgICAgICAgJzxXZWJJbnNwZWN0b3IvJXMu aD4nICUgc2VsZi5vYmpjX3ByZWZpeCgpLAorICAgICAgICAgICAgJzxXZWJJbnNwZWN0b3IvJXMu aD4nICUgc2VsZi5wcm90b2NvbF9uYW1lKCksCiAgICAgICAgIF0KIAogICAgICAgICBoZWFkZXJf YXJncyA9IHsKQEAgLTY2LDcgKzY2LDcgQEAgY2xhc3MgT2JqQ0NvbmZpZ3VyYXRpb25IZWFkZXJH ZW5lcmF0b3IoT2JqQ0dlbmVyYXRvcik6CiAgICAgZGVmIF9nZW5lcmF0ZV9jb25maWd1cmF0aW9u X2ludGVyZmFjZV9mb3JfZG9tYWlucyhzZWxmLCBkb21haW5zKToKICAgICAgICAgbGluZXMgPSBb XQogICAgICAgICBsaW5lcy5hcHBlbmQoJ19fYXR0cmlidXRlX18oKHZpc2liaWxpdHkgKCJkZWZh dWx0IikpKScpCi0gICAgICAgIGxpbmVzLmFwcGVuZCgnQGludGVyZmFjZSAlc0NvbmZpZ3VyYXRp b24gOiBOU09iamVjdCcgJSBzZWxmLm9iamNfcHJlZml4KCkpCisgICAgICAgIGxpbmVzLmFwcGVu ZCgnQGludGVyZmFjZSAlc0NvbmZpZ3VyYXRpb24gOiBOU09iamVjdCcgJSBzZWxmLnByb3RvY29s X25hbWUoKSkKICAgICAgICAgZm9yIGRvbWFpbiBpbiBkb21haW5zOgogICAgICAgICAgICAgbGlu ZXMuZXh0ZW5kKHNlbGYuX2dlbmVyYXRlX3Byb3BlcnRpZXNfZm9yX2RvbWFpbihkb21haW4pKQog ICAgICAgICBsaW5lcy5hcHBlbmQoJ0BlbmQnKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19jb25maWd1cmF0 aW9uX2ltcGxlbWVudGF0aW9uLnB5IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9z Y3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19jb25maWd1cmF0aW9uX2ltcGxlbWVudGF0aW9u LnB5CmluZGV4IDg5MDBlYzcxYjI0MGQ2NDE5M2UwZTMxMWJkN2IyNzdkZDRlZGM5OWMuLjJhNDgy MmRmYzJlNzFkYmYxNWVmZTgyNjZmMjAxMzVjNDc5ZmU1NDAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX29iamNfY29u ZmlndXJhdGlvbl9pbXBsZW1lbnRhdGlvbi5weQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2NvbmZpZ3VyYXRpb25faW1w bGVtZW50YXRpb24ucHkKQEAgLTQxLDEyICs0MSwxMiBAQCBjbGFzcyBPYmpDQmFja2VuZERpc3Bh dGNoZXJJbXBsZW1lbnRhdGlvbkdlbmVyYXRvcihPYmpDR2VuZXJhdG9yKToKICAgICAgICAgT2Jq Q0dlbmVyYXRvci5fX2luaXRfXyhzZWxmLCBtb2RlbCwgaW5wdXRfZmlsZXBhdGgpCiAKICAgICBk ZWYgb3V0cHV0X2ZpbGVuYW1lKHNlbGYpOgotICAgICAgICByZXR1cm4gJyVzQ29uZmlndXJhdGlv bi5tbScgJSBzZWxmLm9iamNfcHJlZml4KCkKKyAgICAgICAgcmV0dXJuICclc0NvbmZpZ3VyYXRp b24ubW0nICUgc2VsZi5wcm90b2NvbF9uYW1lKCkKIAogICAgIGRlZiBnZW5lcmF0ZV9vdXRwdXQo c2VsZik6CiAgICAgICAgIHNlY29uZGFyeV9oZWFkZXJzID0gWwotICAgICAgICAgICAgJyIlc0lu dGVybmFsLmgiJyAlIHNlbGYub2JqY19wcmVmaXgoKSwKLSAgICAgICAgICAgICciJXNCYWNrZW5k RGlzcGF0Y2hlcnMuaCInICUgc2VsZi5vYmpjX3ByZWZpeCgpLAorICAgICAgICAgICAgJyIlc0lu dGVybmFsLmgiJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgpLAorICAgICAgICAgICAgJyIlc0JhY2tl bmREaXNwYXRjaGVycy5oIicgJSBzZWxmLnByb3RvY29sX25hbWUoKSwKICAgICAgICAgICAgICc8 SmF2YVNjcmlwdENvcmUvQWx0ZXJuYXRlRGlzcGF0Y2hhYmxlQWdlbnQuaD4nLAogICAgICAgICAg ICAgJzxKYXZhU2NyaXB0Q29yZS9BdWdtZW50YWJsZUluc3BlY3RvckNvbnRyb2xsZXIuaD4nLAog ICAgICAgICAgICAgJzxKYXZhU2NyaXB0Q29yZS9JbnNwZWN0b3JBbHRlcm5hdGVCYWNrZW5kRGlz cGF0Y2hlcnMuaD4nLApAQCAtNTQsNyArNTQsNyBAQCBjbGFzcyBPYmpDQmFja2VuZERpc3BhdGNo ZXJJbXBsZW1lbnRhdGlvbkdlbmVyYXRvcihPYmpDR2VuZXJhdG9yKToKICAgICAgICAgXQogCiAg ICAgICAgIGhlYWRlcl9hcmdzID0gewotICAgICAgICAgICAgJ3ByaW1hcnlJbmNsdWRlJzogJyIl c0NvbmZpZ3VyYXRpb24uaCInICUgc2VsZi5vYmpjX3ByZWZpeCgpLAorICAgICAgICAgICAgJ3By aW1hcnlJbmNsdWRlJzogJyIlc0NvbmZpZ3VyYXRpb24uaCInICUgc2VsZi5wcm90b2NvbF9uYW1l KCksCiAgICAgICAgICAgICAnc2Vjb25kYXJ5SW5jbHVkZXMnOiAnXG4nLmpvaW4oWycjaW1wb3J0 ICVzJyAlIGhlYWRlciBmb3IgaGVhZGVyIGluIHNlY29uZGFyeV9oZWFkZXJzXSksCiAgICAgICAg IH0KIApAQCAtNzEsNyArNzEsNyBAQCBjbGFzcyBPYmpDQmFja2VuZERpc3BhdGNoZXJJbXBsZW1l bnRhdGlvbkdlbmVyYXRvcihPYmpDR2VuZXJhdG9yKToKIAogICAgIGRlZiBfZ2VuZXJhdGVfY29u ZmlndXJhdGlvbl9pbXBsZW1lbnRhdGlvbl9mb3JfZG9tYWlucyhzZWxmLCBkb21haW5zKToKICAg ICAgICAgbGluZXMgPSBbXQotICAgICAgICBsaW5lcy5hcHBlbmQoJ0BpbXBsZW1lbnRhdGlvbiAl c0NvbmZpZ3VyYXRpb24nICUgc2VsZi5vYmpjX3ByZWZpeCgpKQorICAgICAgICBsaW5lcy5hcHBl bmQoJ0BpbXBsZW1lbnRhdGlvbiAlc0NvbmZpZ3VyYXRpb24nICUgc2VsZi5wcm90b2NvbF9uYW1l KCkpCiAgICAgICAgIGxpbmVzLmFwcGVuZCgneycpCiAgICAgICAgIGxpbmVzLmFwcGVuZCgnICAg IEF1Z21lbnRhYmxlSW5zcGVjdG9yQ29udHJvbGxlciogX2NvbnRyb2xsZXI7JykKICAgICAgICAg bGluZXMuZXh0ZW5kKHNlbGYuX2dlbmVyYXRlX2l2YXJzKGRvbWFpbnMpKQpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVf b2JqY19jb252ZXJzaW9uX2hlbHBlcnMucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2NvbnZlcnNpb25faGVscGVycy5weQpp bmRleCA3OWY3YjFkNDg0ZDlkMzRjZmZiMzg4YjVmOGRkZDljNzAyZTZlYjVkLi4xM2YwMDg0YWY1 ZDFiYWNlODI2MTE5NDA2YTFkMGQ5MDI1MjE4NjY4IDEwMDc1NQotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2NvbnZlcnNp b25faGVscGVycy5weQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Njcmlw dHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2NvbnZlcnNpb25faGVscGVycy5weQpAQCAtNDgsNyAr NDgsNyBAQCBjbGFzcyBPYmpDQ29udmVyc2lvbkhlbHBlcnNHZW5lcmF0b3IoT2JqQ0dlbmVyYXRv cik6CiAgICAgICAgIE9iakNHZW5lcmF0b3IuX19pbml0X18oc2VsZiwgbW9kZWwsIGlucHV0X2Zp bGVwYXRoKQogCiAgICAgZGVmIG91dHB1dF9maWxlbmFtZShzZWxmKToKLSAgICAgICAgcmV0dXJu ICclc0VudW1Db252ZXJzaW9uSGVscGVycy5oJyAlIHNlbGYub2JqY19wcmVmaXgoKQorICAgICAg ICByZXR1cm4gJyVzRW51bUNvbnZlcnNpb25IZWxwZXJzLmgnICUgc2VsZi5wcm90b2NvbF9uYW1l KCkKIAogICAgIGRlZiBkb21haW5zX3RvX2dlbmVyYXRlKHNlbGYpOgogICAgICAgICByZXR1cm4g ZmlsdGVyKE9iakNHZW5lcmF0b3Iuc2hvdWxkX2dlbmVyYXRlX2RvbWFpbl90eXBlc19maWx0ZXIo c2VsZi5tb2RlbCgpKSwgR2VuZXJhdG9yLmRvbWFpbnNfdG9fZ2VuZXJhdGUoc2VsZikpCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9n ZW5lcmF0ZV9vYmpjX2Zyb250ZW5kX2Rpc3BhdGNoZXJfaW1wbGVtZW50YXRpb24ucHkgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpj X2Zyb250ZW5kX2Rpc3BhdGNoZXJfaW1wbGVtZW50YXRpb24ucHkKaW5kZXggNTkwNWQ3NTA0NDI0 NTRkYTI3YTY5M2MyZmZjODZiZTI1NTZkNjkyYi4uZWRkZGNmNzI1NmEyMTg0M2RmOTNhYzBkOWI4 MTU1ZGZlNjk0MWQ2YiAxMDA3NTUKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19mcm9udGVuZF9kaXNwYXRjaGVyX2ltcGxl bWVudGF0aW9uLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0 cy9jb2RlZ2VuL2dlbmVyYXRlX29iamNfZnJvbnRlbmRfZGlzcGF0Y2hlcl9pbXBsZW1lbnRhdGlv bi5weQpAQCAtNDIsMTkgKzQyLDE5IEBAIGNsYXNzIE9iakNGcm9udGVuZERpc3BhdGNoZXJJbXBs ZW1lbnRhdGlvbkdlbmVyYXRvcihPYmpDR2VuZXJhdG9yKToKICAgICAgICAgT2JqQ0dlbmVyYXRv ci5fX2luaXRfXyhzZWxmLCBtb2RlbCwgaW5wdXRfZmlsZXBhdGgpCiAKICAgICBkZWYgb3V0cHV0 X2ZpbGVuYW1lKHNlbGYpOgotICAgICAgICByZXR1cm4gJyVzRXZlbnREaXNwYXRjaGVycy5tbScg JSBzZWxmLm9iamNfcHJlZml4KCkKKyAgICAgICAgcmV0dXJuICclc0V2ZW50RGlzcGF0Y2hlcnMu bW0nICUgc2VsZi5wcm90b2NvbF9uYW1lKCkKIAogICAgIGRlZiBkb21haW5zX3RvX2dlbmVyYXRl KHNlbGYpOgogICAgICAgICByZXR1cm4gZmlsdGVyKE9iakNHZW5lcmF0b3Iuc2hvdWxkX2dlbmVy YXRlX2RvbWFpbl9ldmVudF9kaXNwYXRjaGVyX2ZpbHRlcihzZWxmLm1vZGVsKCkpLCBHZW5lcmF0 b3IuZG9tYWluc190b19nZW5lcmF0ZShzZWxmKSkKIAogICAgIGRlZiBnZW5lcmF0ZV9vdXRwdXQo c2VsZik6CiAgICAgICAgIHNlY29uZGFyeV9oZWFkZXJzID0gWwotICAgICAgICAgICAgJyIlc0Vu dW1Db252ZXJzaW9uSGVscGVycy5oIicgJSBzZWxmLm9iamNfcHJlZml4KCksCisgICAgICAgICAg ICAnIiVzRW51bUNvbnZlcnNpb25IZWxwZXJzLmgiJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgpLAog ICAgICAgICAgICAgJzxKYXZhU2NyaXB0Q29yZS9JbnNwZWN0b3JWYWx1ZXMuaD4nLAogICAgICAg ICBdCiAKICAgICAgICAgaGVhZGVyX2FyZ3MgPSB7Ci0gICAgICAgICAgICAncHJpbWFyeUluY2x1 ZGUnOiAnIiVzSW50ZXJuYWwuaCInICUgc2VsZi5vYmpjX3ByZWZpeCgpLAorICAgICAgICAgICAg J3ByaW1hcnlJbmNsdWRlJzogJyIlc0ludGVybmFsLmgiJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgp LAogICAgICAgICAgICAgJ3NlY29uZGFyeUluY2x1ZGVzJzogJ1xuJy5qb2luKFsnI2ltcG9ydCAl cycgJSBoZWFkZXIgZm9yIGhlYWRlciBpbiBzZWNvbmRhcnlfaGVhZGVyc10pLAogICAgICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9j b2RlZ2VuL2dlbmVyYXRlX29iamNfaGVhZGVyLnB5IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19oZWFkZXIucHkKaW5kZXggMmM1 NDBkYzc3ZDc2NDEyNThkOTJjMjIwMjhiOTdmMWE3ZDE4MzFiMC4uNTgyNTlmNDU3MDY1YzQ1YjQx YmYyZGM2OTRiMjZmMGE3ZjM0MGMwNSAxMDA3NTUKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19oZWFkZXIucHkKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVf b2JqY19oZWFkZXIucHkKQEAgLTQ4LDcgKzQ4LDcgQEAgY2xhc3MgT2JqQ0hlYWRlckdlbmVyYXRv cihPYmpDR2VuZXJhdG9yKToKICAgICAgICAgT2JqQ0dlbmVyYXRvci5fX2luaXRfXyhzZWxmLCBt b2RlbCwgaW5wdXRfZmlsZXBhdGgpCiAKICAgICBkZWYgb3V0cHV0X2ZpbGVuYW1lKHNlbGYpOgot ICAgICAgICByZXR1cm4gJyVzLmgnICUgc2VsZi5vYmpjX3ByZWZpeCgpCisgICAgICAgIHJldHVy biAnJXMuaCcgJSBzZWxmLnByb3RvY29sX25hbWUoKQogCiAgICAgZGVmIGdlbmVyYXRlX291dHB1 dChzZWxmKToKICAgICAgICAgaGVhZGVycyA9IHNldChbCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX2ludGVy bmFsX2hlYWRlci5weSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9j b2RlZ2VuL2dlbmVyYXRlX29iamNfaW50ZXJuYWxfaGVhZGVyLnB5CmluZGV4IGZiZDg4MjBiZmMy YjhjOGU3OTMzNDEwY2ZkYmFiMDUyZTg3N2ZkOGUuLjQ3MDA2Y2ZjNWRiZjdmMTMyNzM0N2IyZTIx Nzc1YWIyYjI2Y2I0YzEgMTAwNzU1Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX29iamNfaW50ZXJuYWxfaGVhZGVyLnB5CisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRl X29iamNfaW50ZXJuYWxfaGVhZGVyLnB5CkBAIC00MSwxMiArNDEsMTIgQEAgY2xhc3MgT2JqQ0lu dGVybmFsSGVhZGVyR2VuZXJhdG9yKE9iakNHZW5lcmF0b3IpOgogICAgICAgICBPYmpDR2VuZXJh dG9yLl9faW5pdF9fKHNlbGYsIG1vZGVsLCBpbnB1dF9maWxlcGF0aCkKIAogICAgIGRlZiBvdXRw dXRfZmlsZW5hbWUoc2VsZik6Ci0gICAgICAgIHJldHVybiAnJXNJbnRlcm5hbC5oJyAlIHNlbGYu b2JqY19wcmVmaXgoKQorICAgICAgICByZXR1cm4gJyVzSW50ZXJuYWwuaCcgJSBzZWxmLnByb3Rv Y29sX25hbWUoKQogCiAgICAgZGVmIGdlbmVyYXRlX291dHB1dChzZWxmKToKICAgICAgICAgaGVh ZGVycyA9IHNldChbCi0gICAgICAgICAgICAnIiVzLmgiJyAlIHNlbGYub2JqY19wcmVmaXgoKSwK LSAgICAgICAgICAgICciJXNKU09OT2JqZWN0UHJpdmF0ZS5oIicgJSBzZWxmLm9iamNfcHJlZml4 KCksCisgICAgICAgICAgICAnIiVzLmgiJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgpLAorICAgICAg ICAgICAgJyIlc0pTT05PYmplY3RQcml2YXRlLmgiJyAlIHNlbGYucHJvdG9jb2xfbmFtZSgpLAog ICAgICAgICAgICAgJzxKYXZhU2NyaXB0Q29yZS9JbnNwZWN0b3JWYWx1ZXMuaD4nLAogICAgICAg ICAgICAgJzxKYXZhU2NyaXB0Q29yZS9BdWdtZW50YWJsZUluc3BlY3RvckNvbnRyb2xsZXIuaD4n LAogICAgICAgICBdKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19wcm90b2NvbF90eXBlc19pbXBsZW1lbnRh dGlvbi5weSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2Vu L2dlbmVyYXRlX29iamNfcHJvdG9jb2xfdHlwZXNfaW1wbGVtZW50YXRpb24ucHkKaW5kZXggNDNh M2Q1NmFmYzIyMmY5ZDk1MWY1MjAwODE5Y2JiY2ExZjA3MWMxYy4uMTA0MzU1NDI4ODIzN2IyNWNk MGRhNTNkYTg3ZjU5MTE5ODliODBlMiAxMDA3NTUKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdGVfb2JqY19wcm90b2NvbF90eXBlc19p bXBsZW1lbnRhdGlvbi5weQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Nj cmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9vYmpjX3Byb3RvY29sX3R5cGVzX2ltcGxlbWVudGF0aW9u LnB5CkBAIC00OCwyMSArNDgsMjEgQEAgY2xhc3MgT2JqQ1Byb3RvY29sVHlwZXNJbXBsZW1lbnRh dGlvbkdlbmVyYXRvcihPYmpDR2VuZXJhdG9yKToKICAgICAgICAgT2JqQ0dlbmVyYXRvci5fX2lu aXRfXyhzZWxmLCBtb2RlbCwgaW5wdXRfZmlsZXBhdGgpCiAKICAgICBkZWYgb3V0cHV0X2ZpbGVu YW1lKHNlbGYpOgotICAgICAgICByZXR1cm4gJyVzVHlwZXMubW0nICUgc2VsZi5vYmpjX3ByZWZp eCgpCisgICAgICAgIHJldHVybiAnJXNUeXBlcy5tbScgJSBzZWxmLnByb3RvY29sX25hbWUoKQog CiAgICAgZGVmIGRvbWFpbnNfdG9fZ2VuZXJhdGUoc2VsZik6CiAgICAgICAgIHJldHVybiBmaWx0 ZXIoT2JqQ0dlbmVyYXRvci5zaG91bGRfZ2VuZXJhdGVfZG9tYWluX3R5cGVzX2ZpbHRlcihzZWxm Lm1vZGVsKCkpLCBHZW5lcmF0b3IuZG9tYWluc190b19nZW5lcmF0ZShzZWxmKSkKIAogICAgIGRl ZiBnZW5lcmF0ZV9vdXRwdXQoc2VsZik6CiAgICAgICAgIHNlY29uZGFyeV9oZWFkZXJzID0gWwot ICAgICAgICAgICAgJyIlc0VudW1Db252ZXJzaW9uSGVscGVycy5oIicgJSBzZWxmLm9iamNfcHJl Zml4KCksCisgICAgICAgICAgICAnIiVzRW51bUNvbnZlcnNpb25IZWxwZXJzLmgiJyAlIHNlbGYu cHJvdG9jb2xfbmFtZSgpLAogICAgICAgICAgICAgR2VuZXJhdG9yLnN0cmluZ19mb3JfZmlsZV9p bmNsdWRlKCclc0pTT05PYmplY3RQcml2YXRlLmgnICUgT2JqQ0dlbmVyYXRvci5PQkpDX1NUQVRJ Q19QUkVGSVgsIEZyYW1ld29ya3MuV2ViSW5zcGVjdG9yLCBzZWxmLm1vZGVsKCkuZnJhbWV3b3Jr KSwKICAgICAgICAgICAgICc8SmF2YVNjcmlwdENvcmUvSW5zcGVjdG9yVmFsdWVzLmg+JywKICAg ICAgICAgICAgICc8d3RmL0Fzc2VydGlvbnMuaD4nLAogICAgICAgICBdCiAKICAgICAgICAgIyBU aGUgRm9vUHJvdG9jb2xJbnRlcm5hbC5oIGhlYWRlciBpcyBvbmx5IG5lZWRlZCB0byBkZWNsYXJl IHRoZSBiYWNrZW5kLXNpZGUgZXZlbnQgZGlzcGF0Y2hlciBiaW5kaW5ncy4KLSAgICAgICAgcHJp bWFyeUluY2x1ZGVOYW1lID0gc2VsZi5vYmpjX3ByZWZpeCgpCisgICAgICAgIHByaW1hcnlJbmNs dWRlTmFtZSA9IHNlbGYucHJvdG9jb2xfbmFtZSgpCiAgICAgICAgIGlmIHNlbGYuZ2V0X2dlbmVy YXRvcl9zZXR0aW5nKCdnZW5lcmF0ZV9iYWNrZW5kJywgRmFsc2UpOgogICAgICAgICAgICAgcHJp bWFyeUluY2x1ZGVOYW1lICs9ICdJbnRlcm5hbCcKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vbW9kZWxzLnB5IGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vbW9kZWxzLnB5CmluZGV4IDMz NDYzNjNlMzU3MTE4YThjNzk0ZDRjOGI4ZGYxMTNhNTVkMmVkNDcuLjNmNDBiZThjYmM4MWQ3YjYy YjhlOTYzOWU0MWVmYjJmY2I5NzI3YjAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL21vZGVscy5weQorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9tb2RlbHMucHkKQEAgLTQ2LDE0ICs0 NiwxNiBAQCBfRlJBTUVXT1JLX0NPTkZJR19NQVAgPSB7CiAgICAgICAgICJhbHRlcm5hdGVfZGlz cGF0Y2hlcnMiOiBUcnVlLAogICAgIH0sCiAgICAgIldlYktpdCI6IHsKLSAgICAgICAgIm9iamNf cHJlZml4IjogIkF1dG9tYXRpb24iLAorICAgICAgICAicHJvdG9jb2xfZ3JvdXAiOiAiQXV0b21h dGlvbiIsCiAgICAgfSwKICAgICAiV2ViSW5zcGVjdG9yIjogeworICAgICAgICAicHJvdG9jb2xf Z3JvdXAiOiAiUldJIiwKICAgICAgICAgIm9iamNfcHJlZml4IjogIlJXSSIsCiAgICAgfSwKICAg ICAjIFVzZWQgZm9yIGNvZGUgZ2VuZXJhdG9yIHRlc3RzLgogICAgICJUZXN0IjogewogICAgICAg ICAiYWx0ZXJuYXRlX2Rpc3BhdGNoZXJzIjogVHJ1ZSwKKyAgICAgICAgInByb3RvY29sX2dyb3Vw IjogIlRlc3QiLAogICAgICAgICAib2JqY19wcmVmaXgiOiAiVGVzdCIsCiAgICAgfQogfQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4v b2JqY19nZW5lcmF0b3IucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Njcmlw dHMvY29kZWdlbi9vYmpjX2dlbmVyYXRvci5weQppbmRleCAwNWNjYzIyZDBlZGRkYTY4MTcyYjg4 Zjg1YzdmNWY3YTNkYWFmNGVmLi4yMzk5ZTdhNjkwNjhjMDg4YjQxYzExNmY5ZDYzZmU0N2RkODhh NmYyIDEwMDc1NQotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMv Y29kZWdlbi9vYmpjX2dlbmVyYXRvci5weQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL3NjcmlwdHMvY29kZWdlbi9vYmpjX2dlbmVyYXRvci5weQpAQCAtOTIsOSArOTIsMTkg QEAgY2xhc3MgT2JqQ0dlbmVyYXRvcihHZW5lcmF0b3IpOgogICAgIGRlZiBfX2luaXRfXyhzZWxm LCBtb2RlbCwgaW5wdXRfZmlsZXBhdGgpOgogICAgICAgICBHZW5lcmF0b3IuX19pbml0X18oc2Vs ZiwgbW9kZWwsIGlucHV0X2ZpbGVwYXRoKQogCisgICAgIyBUaGUgJ3Byb3RvY29sIG5hbWUnIGlz IHVzZWQgdG8gcHJlZml4IGZpbGVuYW1lcyBmb3IgYSBwcm90b2NvbCBncm91cCAoYSBzZXQgb2Yg ZG9tYWlucyBnZW5lcmF0ZWQgdG9nZXRoZXIpLgorICAgIGRlZiBwcm90b2NvbF9uYW1lKHNlbGYp OgorICAgICAgICBwcm90b2NvbF9ncm91cCA9IHNlbGYubW9kZWwoKS5mcmFtZXdvcmsuc2V0dGlu ZygncHJvdG9jb2xfZ3JvdXAnLCAnJykKKyAgICAgICAgcmV0dXJuICclcyVzJyAlIChwcm90b2Nv bF9ncm91cCwgT2JqQ0dlbmVyYXRvci5PQkpDX1NIQVJFRF9QUkVGSVgpCisKKyAgICAjIFRoZSAn T2JqQyBwcmVmaXgnIGlzIHVzZWQgdG8gcHJlZml4IE9iamVjdGl2ZS1DIGNsYXNzIG5hbWVzIGFu ZCBlbnVtcyB3aXRoIGEKKyAgICAjIGZyYW1ld29yay1zcGVjaWZpYyBwcmVmaXguIEl0IGlzIHNl cGFyYXRlIGZyb20gZmlsZW5hbWUgcHJlZml4ZXMuCiAgICAgZGVmIG9iamNfcHJlZml4KHNlbGYp OgotICAgICAgICBmcmFtZXdvcmtfcHJlZml4ID0gc2VsZi5tb2RlbCgpLmZyYW1ld29yay5zZXR0 aW5nKCdvYmpjX3ByZWZpeCcsICcnKQotICAgICAgICByZXR1cm4gJyVzJXMnICUgKGZyYW1ld29y a19wcmVmaXgsIE9iakNHZW5lcmF0b3IuT0JKQ19TSEFSRURfUFJFRklYKQorICAgICAgICBmcmFt ZXdvcmtfcHJlZml4ID0gc2VsZi5tb2RlbCgpLmZyYW1ld29yay5zZXR0aW5nKCdvYmpjX3ByZWZp eCcsIE5vbmUpCisgICAgICAgIGlmIG5vdCBmcmFtZXdvcmtfcHJlZml4OgorICAgICAgICAgICAg cmV0dXJuICcnCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByZXR1cm4gJyVzJXMnICUgKGZy YW1ld29ya19wcmVmaXgsIE9iakNHZW5lcmF0b3IuT0JKQ19TSEFSRURfUFJFRklYKQogCiAgICAg IyBBZGp1c3QgaWRlbnRpZmllciBuYW1lcyB0aGF0IGNvbGxpZGUgd2l0aCBPYmpDIGtleXdvcmRz LgogCg==