199870 2019-07-17 10:51:44 -0700 check-webkit-style: Add limited Python3 support 2019-07-17 14:41:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap commit-queue dean_johnson dewei_zhu ews-watchlist glenn mcatanzaro webkit-bug-importer oldest_to_newest 1553571 0 jbedard 2019-07-17 10:51:44 -0700 Pylint isn't practical (since check-webkit-style is Python 2, any Python 3 syntax will fail), but pycodestyle (the replacement for pep8) is. 1553583 1 jbedard 2019-07-17 11:09:21 -0700 I also think that our current version of pep8 doesn't support Python 3. 1553584 2 374309 jbedard 2019-07-17 11:09:33 -0700 Created attachment 374309 Patch 1553593 3 374309 dean_johnson 2019-07-17 11:16:48 -0700 Comment on attachment 374309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374309&action=review Looks mostly good to me, but I am curious about the categories missing for pycodestyle/W191 and pycodestyle/W291. > Tools/Scripts/webkitpy/style/checker.py:428 > + categories = categories.union(["pep8/W191", "pep8/W291", "pep8/E501", "pycodestyle/E501"]) Any reason not to add pycodestyle/W191 and pycodestyle/W291? > Tools/Scripts/webkitpy/style/checkers/python.py:32 > +from webkitpy.thirdparty.autoinstalled import pycodestyle Maybe we should put this import into `def check` so it isn't installed for everyone who isn't trying to check python3 code style? > Tools/Scripts/webkitpy/style/checkers/python.py:142 > + code = text[:4] Can you add comments or links to documentation for this? > Tools/Scripts/webkitpy/style/checkers/python.py:143 > + message = text[5:] Ditto. > Tools/Scripts/webkitpy/style/checkers/python.py:145 > + self._handle_style_error(line_number, category, 5, message) Ditto (on '5'). 1553600 4 374309 jbedard 2019-07-17 11:27:53 -0700 Comment on attachment 374309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374309&action=review >> Tools/Scripts/webkitpy/style/checker.py:428 >> + categories = categories.union(["pep8/W191", "pep8/W291", "pep8/E501", "pycodestyle/E501"]) > > Any reason not to add pycodestyle/W191 and pycodestyle/W291? Because that's supporting Tools/WebGPUAPIStructure, which it looks like might have tabs in it. In short, we don't need it, and I'm trying not to inherit any more of webkitpy's technical debt than I have to. 1553637 5 374318 jbedard 2019-07-17 13:00:29 -0700 Created attachment 374318 Patch 1553645 6 aakash_jain 2019-07-17 13:08:15 -0700 rs=me 1553652 7 374323 jbedard 2019-07-17 13:27:10 -0700 Created attachment 374323 Patch 1553692 8 374323 commit-queue 2019-07-17 14:40:50 -0700 Comment on attachment 374323 Patch Clearing flags on attachment: 374323 Committed r247538: <https://trac.webkit.org/changeset/247538> 1553693 9 commit-queue 2019-07-17 14:40:51 -0700 All reviewed patches have been landed. Closing bug. 1553694 10 webkit-bug-importer 2019-07-17 14:41:18 -0700 <rdar://problem/53222060> 374309 2019-07-17 11:09:33 -0700 2019-07-17 13:00:28 -0700 Patch bug-199870-20190717110932.patch text/plain 6769 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NzUyMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE5LTA3LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBjaGVjay13ZWJraXQtc3R5bGU6IEFkZCBsaW1pdGVkIFB5dGhvbjMgc3Vw cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 ODcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2lu Y2UgbmV3IHNlcnZpY2VzIHdpbGwgYmUgYWRkZWQgaW4gdGhlIG5lYXIgZnV0dXJlIHdoaWNoIGFy ZSBQeXRob24gMywgd2UKKyAgICAgICAgbmVlZCB0byBzdXBwb3J0IFB5dGhvbiAzIHN0eWxlIGNo ZWNrcy4gRm9yIG5vdywgYXNzdW1lIGFsbCBQeXRob24gZmlsZXMgYXJlCisgICAgICAgIFB5dGhv biAyIHVubGVzcyBvdGhlcndpc2Ugc3BlY2lmaWVkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAgICAoX2FsbF9jYXRlZ29yaWVzKTogQWRkIHB5 Y29kZXN0eWxlIHRvIHZhbGlkIGNhdGVnb3JpZXMgZm9yIHRlc3RpbmcuCisgICAgICAgIChDaGVj a2VyRGlzcGF0Y2hlci5fY3JlYXRlX2NoZWNrZXIpOiBDaGVjayB0aGF0IHRoZSBwcm92aWRlZCBQ eXRob24gZmlsZSBpcyBpbgorICAgICAgICBvbmUgb2YgdGhlIGRlY2xhcmVkIFB5dGhvbiAzIGRp cmVjdG9yaWVzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvcHl0 aG9uLnB5OgorICAgICAgICAoUHl0aG9uM0NoZWNrZXIpOiBBZGQgUHl0aG9uIDMgY2hlY2tlciwg d2hpY2ggZG9lc24ndCBsaW50IGFuZCB1c2VzIHB5Y29kZXN0eWxlCisgICAgICAgIGluc3RlYWQg b2YgcGVwOC4KKyAgICAgICAgKFB5dGhvbjNDaGVja2VyLl9faW5pdF9fKToKKyAgICAgICAgKFB5 dGhvbjNDaGVja2VyLmNoZWNrKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFy dHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suZmluZF9tb2R1 bGUpOiBTdXBwb3J0IGF1dG8taW5zdGFsbGluZyBweWNvZGVzdHlsZS4KKyAgICAgICAgKEF1dG9p bnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9weWNvZGVzdHlsZSk6CisKIDIwMTktMDctMTcgIFJ1 c3NlbGwgRXBzdGVpbiAgPHJ1c3NlbGxfZUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkaW5nIHNl bGYgdG8gY29udHJpYnV0b3JzLmpzb24KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXIucHkJKHJldmlzaW9uIDI0NzUxNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlci5weQkod29ya2luZyBjb3B5KQpAQCAtMSw3ICsxLDcgQEAKICMgQ29weXJp Z2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjIENvcHlyaWdo dCAoQykgMjAxMCBDaHJpcyBKZXJkb25layAoY2hyaXMuamVyZG9uZWtAZ21haWwuY29tKQogIyBD b3B5cmlnaHQgKEMpIDIwMTAgUHJvRlVTSU9OIGVtYmVkZGVkIHN5c3RlbXMKLSMgQ29weXJpZ2h0 IChDKSAyMDEzLTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmln aHQgKEMpIDIwMTMtMjAxNywgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAj CiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC01MCw3ICs1MCw3IEBAIGZyb20gY2hl Y2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05DU1MKIGZyb20gY2hlY2tlcnMuanN0ZXN0IGlt cG9ydCBKU1Rlc3RDaGVja2VyCiBmcm9tIGNoZWNrZXJzLm1lc3NhZ2VzaW4gaW1wb3J0IE1lc3Nh Z2VzSW5DaGVja2VyCiBmcm9tIGNoZWNrZXJzLnBuZyBpbXBvcnQgUE5HQ2hlY2tlcgotZnJvbSBj aGVja2Vycy5weXRob24gaW1wb3J0IFB5dGhvbkNoZWNrZXIKK2Zyb20gY2hlY2tlcnMucHl0aG9u IGltcG9ydCBQeXRob25DaGVja2VyLCBQeXRob24zQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5zZGt2 YXJpYW50IGltcG9ydCBTREtWYXJpYW50Q2hlY2tlcgogZnJvbSBjaGVja2Vycy50ZXN0X2V4cGVj dGF0aW9ucyBpbXBvcnQgVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIKIGZyb20gY2hlY2tlcnMudGV4 dCBpbXBvcnQgVGV4dENoZWNrZXIKQEAgLTExNyw2ICsxMTcsNyBAQCBfQkFTRV9GSUxURVJfUlVM RVMgPSBbCiAgICAgIyAgICAgICAgd2l0aCB0aGUgNzkgY2hhcmFjdGVyIGxpbWl0LCBvciBzb21l IGhpZ2hlciBsaW1pdCB0aGF0IGlzCiAgICAgIyAgICAgICAgYWdyZWVhYmxlIHRvIHRoZSBXZWJL aXQgcHJvamVjdC4KICAgICAnLXBlcDgvRTUwMScsCisgICAgJy1weWNvZGVzdHlsZS9FNTAxJywK IAogICAgICMgRklYTUU6IE1vdmUgdGhlIHB5bGludCBydWxlcyBmcm9tIHRoZSBweWxpbnRyYyB0 byBoZXJlLiBUaGlzIHdpbGwKICAgICAjIGFsc28gcmVxdWlyZSB1cyB0byByZS13b3JrIGxpbnQt d2Via2l0cHkgdG8gcHJvZHVjZSB0aGUgZXF1aXZhbGVudCBvdXRwdXQuCkBAIC00MjQsNyArNDI1 LDcgQEAgZGVmIF9hbGxfY2F0ZWdvcmllcygpOgogICAgICMgICAgICAgIG5vdyB3ZSBhZGQgb25s eSB0aGUgY2F0ZWdvcmllcyBuZWVkZWQgZm9yIHRoZSB1bml0IHRlc3RzCiAgICAgIyAgICAgICAg KHdoaWNoIHZhbGlkYXRlIHRoZSBjb25zaXN0ZW5jeSBvZiB0aGUgY29uZmlndXJhdGlvbgogICAg ICMgICAgICAgIHNldHRpbmdzIGFnYWluc3QgdGhlIGtub3duIGNhdGVnb3JpZXMsIGV0YykuCi0g ICAgY2F0ZWdvcmllcyA9IGNhdGVnb3JpZXMudW5pb24oWyJwZXA4L1cxOTEiLCAicGVwOC9XMjkx IiwgInBlcDgvRTUwMSJdKQorICAgIGNhdGVnb3JpZXMgPSBjYXRlZ29yaWVzLnVuaW9uKFsicGVw OC9XMTkxIiwgInBlcDgvVzI5MSIsICJwZXA4L0U1MDEiLCAicHljb2Rlc3R5bGUvRTUwMSJdKQog CiAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6CiAgICAgICAgIGNhdGVnb3JpZXMgPSBjYXRlZ29y aWVzLnVuaW9uKGFwcGxlX2FkZGl0aW9ucygpLmFsbF9jYXRlZ29yaWVzKCkpCkBAIC03MDEsNiAr NzAyLDEwIEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAgICAgICBl bHNlOgogICAgICAgICAgICAgICAgIGNoZWNrZXIgPSBKU09OQ2hlY2tlcihmaWxlX3BhdGgsIGhh bmRsZV9zdHlsZV9lcnJvcikKICAgICAgICAgZWxpZiBmaWxlX3R5cGUgPT0gRmlsZVR5cGUuUFlU SE9OOgorICAgICAgICAgICAgcHl0aG9uM19wYXRocyA9IFtdCisgICAgICAgICAgICBmb3IgcGFy dGlhbCBpbiBweXRob24zX3BhdGhzOgorICAgICAgICAgICAgICAgIGlmIGZpbGVfcGF0aC5zdGFy dHN3aXRoKHBhcnRpYWwpOgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gUHl0aG9uM0NoZWNr ZXIoZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpCiAgICAgICAgICAgICBpZiBhcHBsZV9h ZGRpdGlvbnMoKToKICAgICAgICAgICAgICAgICBjaGVja2VyID0gYXBwbGVfYWRkaXRpb25zKCku cHl0aG9uX2NoZWNrZXIoZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpCiAgICAgICAgICAg ICBlbHNlOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9weXRo b24ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vy cy9weXRob24ucHkJKHJldmlzaW9uIDI0NzUxNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlcnMvcHl0aG9uLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNSBAQAog IyBDb3B5cmlnaHQgKEMpIDIwMTAgQ2hyaXMgSmVyZG9uZWsgKGNqZXJkb25la0B3ZWJraXQub3Jn KQorIyBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog IwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCw2ICsyOSw3IEBAIGZyb20gU3RyaW5n SU8gaW1wb3J0IFN0cmluZ0lPCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3Rl bSBpbXBvcnQgRmlsZVN5c3RlbQogZnJvbSB3ZWJraXRweS5jb21tb24ud2Via2l0X2ZpbmRlciBp bXBvcnQgV2ViS2l0RmluZGVyCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxl ZCBpbXBvcnQgcGVwOAorZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQgaW1w b3J0IHB5Y29kZXN0eWxlCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5w eWxpbnQgaW1wb3J0IGxpbnQKIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVk LnB5bGludC5yZXBvcnRlcnMudGV4dCBpbXBvcnQgUGFyc2VhYmxlVGV4dFJlcG9ydGVyCiAKQEAg LTEyNywzICsxMjksMjEgQEAgY2xhc3MgX0ZpbHRlcmVkU3RyaW5nSU8oU3RyaW5nSU8pOgogICAg ICAgICAgICAgaWYgbXNnID09ICdcbic6CiAgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKICAg ICAgICAgcmV0dXJuIEZhbHNlCisKKworY2xhc3MgUHl0aG9uM0NoZWNrZXIob2JqZWN0KToKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpOgorICAg ICAgICBzZWxmLl9maWxlX3BhdGggPSBmaWxlX3BhdGgKKyAgICAgICAgc2VsZi5faGFuZGxlX3N0 eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vycm9yCisKKyAgICBkZWYgY2hlY2soc2VsZiwgbGlu ZXMpOgorCisgICAgICAgIGRlZiBoYW5kbGVyKGxpbmVfbnVtYmVyLCBvZmZzZXQsIHRleHQsIGNo ZWNrKToKKyAgICAgICAgICAgIGNvZGUgPSB0ZXh0Wzo0XQorICAgICAgICAgICAgbWVzc2FnZSA9 IHRleHRbNTpdCisgICAgICAgICAgICBjYXRlZ29yeSA9ICJweWNvZGVzdHlsZS8iICsgY29kZQor ICAgICAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yKGxpbmVfbnVtYmVyLCBjYXRlZ29y eSwgNSwgbWVzc2FnZSkKKworICAgICAgICBjaGVja2VyID0gcHljb2Rlc3R5bGUuQ2hlY2tlcihz ZWxmLl9maWxlX3BhdGgpCisgICAgICAgIGNoZWNrZXIucmVwb3J0X2Vycm9yID0gaGFuZGxlcgor ICAgICAgICBjaGVja2VyLmNoZWNrX2FsbCgpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3RoaXJkcGFydHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNDc1MTQpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAg LTkxLDYgKzkxLDggQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAg ICAgICAgICBzZWxmLl9pbnN0YWxsX21lY2hhbml6ZSgpCiAgICAgICAgIGVsaWYgJy5wZXA4JyBp biBmdWxsbmFtZToKICAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfcGVwOCgpCisgICAgICAgIGVs aWYgJy5weWNvZGVzdHlsZScgaW4gZnVsbG5hbWU6CisgICAgICAgICAgICBzZWxmLl9pbnN0YWxs X3B5Y29kZXN0eWxlKCkKICAgICAgICAgZWxpZiAnLnB5bGludCcgaW4gZnVsbG5hbWU6CiAgICAg ICAgICAgICBzZWxmLl9pbnN0YWxsX3B5bGludCgpCiAgICAgICAgIGVsaWYgJy5jb3ZlcmFnZScg aW4gZnVsbG5hbWU6CkBAIC0xMjksNiArMTMxLDkgQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRI b29rKG9iamVjdCk6CiAgICAgZGVmIF9pbnN0YWxsX3BlcDgoc2VsZik6CiAgICAgICAgIHNlbGYu X2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9zb3VyY2Uv cC9wZXA4L3BlcDgtMC41LjAudGFyLmd6IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg InBlcDgtMC41LjAvcGVwOC5weSIpCisgICAgZGVmIF9pbnN0YWxsX3B5Y29kZXN0eWxlKHNlbGYp OgorICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcv cGFja2FnZXMvc291cmNlL3AvcHljb2Rlc3R5bGUvcHljb2Rlc3R5bGUtMi41LjAudGFyLmd6IiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInB5Y29kZXN0eWxlLTIuNS4wL3B5Y29kZXN0 eWxlLnB5IikKIAogICAgIGRlZiBfaW5zdGFsbF9tb3psb2coc2VsZik6CiAgICAgICAgIHNlbGYu X2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCg== 374318 2019-07-17 13:00:29 -0700 2019-07-17 13:27:09 -0700 Patch bug-199870-20190717130028.patch text/plain 6619 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NzUyMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE5LTA3LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBjaGVjay13ZWJraXQtc3R5bGU6IEFkZCBsaW1pdGVkIFB5dGhvbjMgc3Vw cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 ODcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2lu Y2UgbmV3IHNlcnZpY2VzIHdpbGwgYmUgYWRkZWQgaW4gdGhlIG5lYXIgZnV0dXJlIHdoaWNoIGFy ZSBQeXRob24gMywgd2UKKyAgICAgICAgbmVlZCB0byBzdXBwb3J0IFB5dGhvbiAzIHN0eWxlIGNo ZWNrcy4gRm9yIG5vdywgYXNzdW1lIGFsbCBQeXRob24gZmlsZXMgYXJlCisgICAgICAgIFB5dGhv biAyIHVubGVzcyBvdGhlcndpc2Ugc3BlY2lmaWVkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAgICAoX2FsbF9jYXRlZ29yaWVzKTogQWRkIHB5 Y29kZXN0eWxlIHRvIHZhbGlkIGNhdGVnb3JpZXMgZm9yIHRlc3RpbmcuCisgICAgICAgIChDaGVj a2VyRGlzcGF0Y2hlci5fY3JlYXRlX2NoZWNrZXIpOiBDaGVjayB0aGF0IHRoZSBwcm92aWRlZCBQ eXRob24gZmlsZSBpcyBpbgorICAgICAgICBvbmUgb2YgdGhlIGRlY2xhcmVkIFB5dGhvbiAzIGRp cmVjdG9yaWVzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvcHl0 aG9uLnB5OgorICAgICAgICAoUHl0aG9uM0NoZWNrZXIpOiBBZGQgUHl0aG9uIDMgY2hlY2tlciwg d2hpY2ggZG9lc24ndCBsaW50IGFuZCB1c2VzIHB5Y29kZXN0eWxlCisgICAgICAgIGluc3RlYWQg b2YgcGVwOC4KKyAgICAgICAgKFB5dGhvbjNDaGVja2VyLl9faW5pdF9fKToKKyAgICAgICAgKFB5 dGhvbjNDaGVja2VyLmNoZWNrKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFy dHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suZmluZF9tb2R1 bGUpOiBTdXBwb3J0IGF1dG8taW5zdGFsbGluZyBweWNvZGVzdHlsZS4KKyAgICAgICAgKEF1dG9p bnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9weWNvZGVzdHlsZSk6CisKIDIwMTktMDctMTcgIFJ1 c3NlbGwgRXBzdGVpbiAgPHJ1c3NlbGxfZUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkaW5nIHNl bGYgdG8gY29udHJpYnV0b3JzLmpzb24KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXIucHkJKHJldmlzaW9uIDI0NzUxNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlci5weQkod29ya2luZyBjb3B5KQpAQCAtMSw3ICsxLDcgQEAKICMgQ29weXJp Z2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjIENvcHlyaWdo dCAoQykgMjAxMCBDaHJpcyBKZXJkb25layAoY2hyaXMuamVyZG9uZWtAZ21haWwuY29tKQogIyBD b3B5cmlnaHQgKEMpIDIwMTAgUHJvRlVTSU9OIGVtYmVkZGVkIHN5c3RlbXMKLSMgQ29weXJpZ2h0 IChDKSAyMDEzLTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmln aHQgKEMpIDIwMTMtMjAxNywgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAj CiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC01MCw3ICs1MCw3IEBAIGZyb20gY2hl Y2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05DU1MKIGZyb20gY2hlY2tlcnMuanN0ZXN0IGlt cG9ydCBKU1Rlc3RDaGVja2VyCiBmcm9tIGNoZWNrZXJzLm1lc3NhZ2VzaW4gaW1wb3J0IE1lc3Nh Z2VzSW5DaGVja2VyCiBmcm9tIGNoZWNrZXJzLnBuZyBpbXBvcnQgUE5HQ2hlY2tlcgotZnJvbSBj aGVja2Vycy5weXRob24gaW1wb3J0IFB5dGhvbkNoZWNrZXIKK2Zyb20gY2hlY2tlcnMucHl0aG9u IGltcG9ydCBQeXRob25DaGVja2VyLCBQeXRob24zQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5zZGt2 YXJpYW50IGltcG9ydCBTREtWYXJpYW50Q2hlY2tlcgogZnJvbSBjaGVja2Vycy50ZXN0X2V4cGVj dGF0aW9ucyBpbXBvcnQgVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIKIGZyb20gY2hlY2tlcnMudGV4 dCBpbXBvcnQgVGV4dENoZWNrZXIKQEAgLTExNyw2ICsxMTcsNyBAQCBfQkFTRV9GSUxURVJfUlVM RVMgPSBbCiAgICAgIyAgICAgICAgd2l0aCB0aGUgNzkgY2hhcmFjdGVyIGxpbWl0LCBvciBzb21l IGhpZ2hlciBsaW1pdCB0aGF0IGlzCiAgICAgIyAgICAgICAgYWdyZWVhYmxlIHRvIHRoZSBXZWJL aXQgcHJvamVjdC4KICAgICAnLXBlcDgvRTUwMScsCisgICAgJy1weWNvZGVzdHlsZS9FNTAxJywK IAogICAgICMgRklYTUU6IE1vdmUgdGhlIHB5bGludCBydWxlcyBmcm9tIHRoZSBweWxpbnRyYyB0 byBoZXJlLiBUaGlzIHdpbGwKICAgICAjIGFsc28gcmVxdWlyZSB1cyB0byByZS13b3JrIGxpbnQt d2Via2l0cHkgdG8gcHJvZHVjZSB0aGUgZXF1aXZhbGVudCBvdXRwdXQuCkBAIC00MjQsNyArNDI1 LDcgQEAgZGVmIF9hbGxfY2F0ZWdvcmllcygpOgogICAgICMgICAgICAgIG5vdyB3ZSBhZGQgb25s eSB0aGUgY2F0ZWdvcmllcyBuZWVkZWQgZm9yIHRoZSB1bml0IHRlc3RzCiAgICAgIyAgICAgICAg KHdoaWNoIHZhbGlkYXRlIHRoZSBjb25zaXN0ZW5jeSBvZiB0aGUgY29uZmlndXJhdGlvbgogICAg ICMgICAgICAgIHNldHRpbmdzIGFnYWluc3QgdGhlIGtub3duIGNhdGVnb3JpZXMsIGV0YykuCi0g ICAgY2F0ZWdvcmllcyA9IGNhdGVnb3JpZXMudW5pb24oWyJwZXA4L1cxOTEiLCAicGVwOC9XMjkx IiwgInBlcDgvRTUwMSJdKQorICAgIGNhdGVnb3JpZXMgPSBjYXRlZ29yaWVzLnVuaW9uKFsicGVw OC9XMTkxIiwgInBlcDgvVzI5MSIsICJwZXA4L0U1MDEiLCAicHljb2Rlc3R5bGUvRTUwMSJdKQog CiAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6CiAgICAgICAgIGNhdGVnb3JpZXMgPSBjYXRlZ29y aWVzLnVuaW9uKGFwcGxlX2FkZGl0aW9ucygpLmFsbF9jYXRlZ29yaWVzKCkpCkBAIC03MDEsNiAr NzAyLDEwIEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAgICAgICBl bHNlOgogICAgICAgICAgICAgICAgIGNoZWNrZXIgPSBKU09OQ2hlY2tlcihmaWxlX3BhdGgsIGhh bmRsZV9zdHlsZV9lcnJvcikKICAgICAgICAgZWxpZiBmaWxlX3R5cGUgPT0gRmlsZVR5cGUuUFlU SE9OOgorICAgICAgICAgICAgcHl0aG9uM19wYXRocyA9IFsnVG9vbHMvcmVzdWx0c2RicHknXQor ICAgICAgICAgICAgZm9yIHBhcnRpYWwgaW4gcHl0aG9uM19wYXRoczoKKyAgICAgICAgICAgICAg ICBpZiBmaWxlX3BhdGguc3RhcnRzd2l0aChwYXJ0aWFsKToKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIFB5dGhvbjNDaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKQogICAg ICAgICAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6CiAgICAgICAgICAgICAgICAgY2hlY2tlciA9 IGFwcGxlX2FkZGl0aW9ucygpLnB5dGhvbl9jaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxl X2Vycm9yKQogICAgICAgICAgICAgZWxzZToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlcnMvcHl0aG9uLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlcnMvcHl0aG9uLnB5CShyZXZpc2lvbiAyNDc1MTQpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3B5dGhvbi5weQkod29ya2luZyBjb3B5 KQpAQCAtMSw0ICsxLDUgQEAKICMgQ29weXJpZ2h0IChDKSAyMDEwIENocmlzIEplcmRvbmVrIChj amVyZG9uZWtAd2Via2l0Lm9yZykKKyMgQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTI3LDMg KzEyOCwyOCBAQCBjbGFzcyBfRmlsdGVyZWRTdHJpbmdJTyhTdHJpbmdJTyk6CiAgICAgICAgICAg ICBpZiBtc2cgPT0gJ1xuJzoKICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICBy ZXR1cm4gRmFsc2UKKworCitjbGFzcyBQeXRob24zQ2hlY2tlcihvYmplY3QpOgorICAgIGRlZiBf X2luaXRfXyhzZWxmLCBmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcik6CisgICAgICAgIHNl bGYuX2ZpbGVfcGF0aCA9IGZpbGVfcGF0aAorICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJy b3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKKworICAgIGRlZiBjaGVjayhzZWxmLCBsaW5lcyk6Cisg ICAgICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkIGltcG9ydCBweWNv ZGVzdHlsZQorCisgICAgICAgIGRlZiBoYW5kbGVyKGxpbmVfbnVtYmVyLCBvZmZzZXQsIHRleHQs IGNoZWNrKToKKyAgICAgICAgICAgICMgVGV4dCBpcyBvZiB0aGUgZm9ybSAnRSMjIyA8ZGVzY3Jp cHRpb24gb2YgZXJyb3I+JworICAgICAgICAgICAgY29kZSA9IHRleHRbOjRdCisgICAgICAgICAg ICBtZXNzYWdlID0gdGV4dFs1Ol0KKyAgICAgICAgICAgIGNhdGVnb3J5ID0gInB5Y29kZXN0eWxl LyIgKyBjb2RlCisgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IoCisgICAgICAg ICAgICAgICAgbGluZV9udW1iZXI9bGluZV9udW1iZXIsCisgICAgICAgICAgICAgICAgY2F0ZWdv cnk9Y2F0ZWdvcnksCisgICAgICAgICAgICAgICAgY29uZmlkZW5jZT01LAorICAgICAgICAgICAg ICAgIG1lc3NhZ2U9bWVzc2FnZSwKKyAgICAgICAgICAgICkKKworICAgICAgICBjaGVja2VyID0g cHljb2Rlc3R5bGUuQ2hlY2tlcihzZWxmLl9maWxlX3BhdGgpCisgICAgICAgIGNoZWNrZXIucmVw b3J0X2Vycm9yID0gaGFuZGxlcgorICAgICAgICBjaGVja2VyLmNoZWNrX2FsbCgpCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CShyZXZpc2lv biAyNDc1MTQpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18u cHkJKHdvcmtpbmcgY29weSkKQEAgLTkxLDYgKzkxLDggQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBv cnRIb29rKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX21lY2hhbml6ZSgpCiAg ICAgICAgIGVsaWYgJy5wZXA4JyBpbiBmdWxsbmFtZToKICAgICAgICAgICAgIHNlbGYuX2luc3Rh bGxfcGVwOCgpCisgICAgICAgIGVsaWYgJy5weWNvZGVzdHlsZScgaW4gZnVsbG5hbWU6CisgICAg ICAgICAgICBzZWxmLl9pbnN0YWxsX3B5Y29kZXN0eWxlKCkKICAgICAgICAgZWxpZiAnLnB5bGlu dCcgaW4gZnVsbG5hbWU6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5bGludCgpCiAgICAg ICAgIGVsaWYgJy5jb3ZlcmFnZScgaW4gZnVsbG5hbWU6CkBAIC0xMjksNiArMTMxLDkgQEAgY2xh c3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgZGVmIF9pbnN0YWxsX3BlcDgo c2VsZik6CiAgICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVk Lm9yZy9wYWNrYWdlcy9zb3VyY2UvcC9wZXA4L3BlcDgtMC41LjAudGFyLmd6IiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgInBlcDgtMC41LjAvcGVwOC5weSIpCisgICAgZGVmIF9pbnN0 YWxsX3B5Y29kZXN0eWxlKHNlbGYpOgorICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2Zp bGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvc291cmNlL3AvcHljb2Rlc3R5bGUvcHljb2Rl c3R5bGUtMi41LjAudGFyLmd6IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInB5Y29k ZXN0eWxlLTIuNS4wL3B5Y29kZXN0eWxlLnB5IikKIAogICAgIGRlZiBfaW5zdGFsbF9tb3psb2co c2VsZik6CiAgICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNf cGF0aCgpCg== 374323 2019-07-17 13:27:10 -0700 2019-07-17 14:40:50 -0700 Patch bug-199870-20190717132709.patch text/plain 6622 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NzUzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE5LTA3LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBjaGVjay13ZWJraXQtc3R5bGU6IEFkZCBsaW1pdGVkIFB5dGhvbjMgc3Vw cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 ODcwCisKKyAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAg U2luY2UgbmV3IHNlcnZpY2VzIHdpbGwgYmUgYWRkZWQgaW4gdGhlIG5lYXIgZnV0dXJlIHdoaWNo IGFyZSBQeXRob24gMywgd2UKKyAgICAgICAgbmVlZCB0byBzdXBwb3J0IFB5dGhvbiAzIHN0eWxl IGNoZWNrcy4gRm9yIG5vdywgYXNzdW1lIGFsbCBQeXRob24gZmlsZXMgYXJlCisgICAgICAgIFB5 dGhvbiAyIHVubGVzcyBvdGhlcndpc2Ugc3BlY2lmaWVkLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAgICAoX2FsbF9jYXRlZ29yaWVzKTogQWRk IHB5Y29kZXN0eWxlIHRvIHZhbGlkIGNhdGVnb3JpZXMgZm9yIHRlc3RpbmcuCisgICAgICAgIChD aGVja2VyRGlzcGF0Y2hlci5fY3JlYXRlX2NoZWNrZXIpOiBDaGVjayB0aGF0IHRoZSBwcm92aWRl ZCBQeXRob24gZmlsZSBpcyBpbgorICAgICAgICBvbmUgb2YgdGhlIGRlY2xhcmVkIFB5dGhvbiAz IGRpcmVjdG9yaWVzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMv cHl0aG9uLnB5OgorICAgICAgICAoUHl0aG9uM0NoZWNrZXIpOiBBZGQgUHl0aG9uIDMgY2hlY2tl ciwgd2hpY2ggZG9lc24ndCBsaW50IGFuZCB1c2VzIHB5Y29kZXN0eWxlCisgICAgICAgIGluc3Rl YWQgb2YgcGVwOC4KKyAgICAgICAgKFB5dGhvbjNDaGVja2VyLl9faW5pdF9fKToKKyAgICAgICAg KFB5dGhvbjNDaGVja2VyLmNoZWNrKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJk cGFydHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suZmluZF9t b2R1bGUpOiBTdXBwb3J0IGF1dG8taW5zdGFsbGluZyBweWNvZGVzdHlsZS4KKyAgICAgICAgKEF1 dG9pbnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9weWNvZGVzdHlsZSk6CisKIDIwMTktMDctMTcg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBB ZGQgYSBydW50aW1lLWRpc2FibGVkIGRpYWxvZyBlbGVtZW50IHNrZWxldG9uCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CShyZXZpc2lvbiAyNDc1MzApCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHdvcmtpbmcgY29weSkKQEAg LTEsNyArMSw3IEBACiAjIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIwMTAgQ2hyaXMgSmVyZG9uZWsgKGNocmlzLmpl cmRvbmVrQGdtYWlsLmNvbSkKICMgQ29weXJpZ2h0IChDKSAyMDEwIFByb0ZVU0lPTiBlbWJlZGRl ZCBzeXN0ZW1zCi0jIENvcHlyaWdodCAoQykgMjAxMy0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDEzLTIwMTcsIDIwMTkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAt NTAsNyArNTAsNyBAQCBmcm9tIGNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09OQ1NTCiBm cm9tIGNoZWNrZXJzLmpzdGVzdCBpbXBvcnQgSlNUZXN0Q2hlY2tlcgogZnJvbSBjaGVja2Vycy5t ZXNzYWdlc2luIGltcG9ydCBNZXNzYWdlc0luQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5wbmcgaW1w b3J0IFBOR0NoZWNrZXIKLWZyb20gY2hlY2tlcnMucHl0aG9uIGltcG9ydCBQeXRob25DaGVja2Vy Citmcm9tIGNoZWNrZXJzLnB5dGhvbiBpbXBvcnQgUHl0aG9uQ2hlY2tlciwgUHl0aG9uM0NoZWNr ZXIKIGZyb20gY2hlY2tlcnMuc2RrdmFyaWFudCBpbXBvcnQgU0RLVmFyaWFudENoZWNrZXIKIGZy b20gY2hlY2tlcnMudGVzdF9leHBlY3RhdGlvbnMgaW1wb3J0IFRlc3RFeHBlY3RhdGlvbnNDaGVj a2VyCiBmcm9tIGNoZWNrZXJzLnRleHQgaW1wb3J0IFRleHRDaGVja2VyCkBAIC0xMTcsNiArMTE3 LDcgQEAgX0JBU0VfRklMVEVSX1JVTEVTID0gWwogICAgICMgICAgICAgIHdpdGggdGhlIDc5IGNo YXJhY3RlciBsaW1pdCwgb3Igc29tZSBoaWdoZXIgbGltaXQgdGhhdCBpcwogICAgICMgICAgICAg IGFncmVlYWJsZSB0byB0aGUgV2ViS2l0IHByb2plY3QuCiAgICAgJy1wZXA4L0U1MDEnLAorICAg ICctcHljb2Rlc3R5bGUvRTUwMScsCiAKICAgICAjIEZJWE1FOiBNb3ZlIHRoZSBweWxpbnQgcnVs ZXMgZnJvbSB0aGUgcHlsaW50cmMgdG8gaGVyZS4gVGhpcyB3aWxsCiAgICAgIyBhbHNvIHJlcXVp cmUgdXMgdG8gcmUtd29yayBsaW50LXdlYmtpdHB5IHRvIHByb2R1Y2UgdGhlIGVxdWl2YWxlbnQg b3V0cHV0LgpAQCAtNDI0LDcgKzQyNSw3IEBAIGRlZiBfYWxsX2NhdGVnb3JpZXMoKToKICAgICAj ICAgICAgICBub3cgd2UgYWRkIG9ubHkgdGhlIGNhdGVnb3JpZXMgbmVlZGVkIGZvciB0aGUgdW5p dCB0ZXN0cwogICAgICMgICAgICAgICh3aGljaCB2YWxpZGF0ZSB0aGUgY29uc2lzdGVuY3kgb2Yg dGhlIGNvbmZpZ3VyYXRpb24KICAgICAjICAgICAgICBzZXR0aW5ncyBhZ2FpbnN0IHRoZSBrbm93 biBjYXRlZ29yaWVzLCBldGMpLgotICAgIGNhdGVnb3JpZXMgPSBjYXRlZ29yaWVzLnVuaW9uKFsi cGVwOC9XMTkxIiwgInBlcDgvVzI5MSIsICJwZXA4L0U1MDEiXSkKKyAgICBjYXRlZ29yaWVzID0g Y2F0ZWdvcmllcy51bmlvbihbInBlcDgvVzE5MSIsICJwZXA4L1cyOTEiLCAicGVwOC9FNTAxIiwg InB5Y29kZXN0eWxlL0U1MDEiXSkKIAogICAgIGlmIGFwcGxlX2FkZGl0aW9ucygpOgogICAgICAg ICBjYXRlZ29yaWVzID0gY2F0ZWdvcmllcy51bmlvbihhcHBsZV9hZGRpdGlvbnMoKS5hbGxfY2F0 ZWdvcmllcygpKQpAQCAtNzAxLDYgKzcwMiwxMCBAQCBjbGFzcyBDaGVja2VyRGlzcGF0Y2hlcihv YmplY3QpOgogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBjaGVja2VyID0gSlNP TkNoZWNrZXIoZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpCiAgICAgICAgIGVsaWYgZmls ZV90eXBlID09IEZpbGVUeXBlLlBZVEhPTjoKKyAgICAgICAgICAgIHB5dGhvbjNfcGF0aHMgPSBb XQorICAgICAgICAgICAgZm9yIHBhcnRpYWwgaW4gcHl0aG9uM19wYXRoczoKKyAgICAgICAgICAg ICAgICBpZiBmaWxlX3BhdGguc3RhcnRzd2l0aChwYXJ0aWFsKToKKyAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIFB5dGhvbjNDaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKQog ICAgICAgICAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6CiAgICAgICAgICAgICAgICAgY2hlY2tl ciA9IGFwcGxlX2FkZGl0aW9ucygpLnB5dGhvbl9jaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0 eWxlX2Vycm9yKQogICAgICAgICAgICAgZWxzZToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvcHl0aG9uLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvcHl0aG9uLnB5CShyZXZpc2lvbiAyNDc1MzApCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3B5dGhvbi5weQkod29ya2luZyBj b3B5KQpAQCAtMSw0ICsxLDUgQEAKICMgQ29weXJpZ2h0IChDKSAyMDEwIENocmlzIEplcmRvbmVr IChjamVyZG9uZWtAd2Via2l0Lm9yZykKKyMgQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTI3 LDMgKzEyOCwyOCBAQCBjbGFzcyBfRmlsdGVyZWRTdHJpbmdJTyhTdHJpbmdJTyk6CiAgICAgICAg ICAgICBpZiBtc2cgPT0gJ1xuJzoKICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAg ICByZXR1cm4gRmFsc2UKKworCitjbGFzcyBQeXRob24zQ2hlY2tlcihvYmplY3QpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcik6CisgICAgICAg IHNlbGYuX2ZpbGVfcGF0aCA9IGZpbGVfcGF0aAorICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVf ZXJyb3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKKworICAgIGRlZiBjaGVjayhzZWxmLCBsaW5lcyk6 CisgICAgICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkIGltcG9ydCBw eWNvZGVzdHlsZQorCisgICAgICAgIGRlZiBoYW5kbGVyKGxpbmVfbnVtYmVyLCBvZmZzZXQsIHRl eHQsIGNoZWNrKToKKyAgICAgICAgICAgICMgVGV4dCBpcyBvZiB0aGUgZm9ybSAnRSMjIyA8ZGVz Y3JpcHRpb24gb2YgZXJyb3I+JworICAgICAgICAgICAgY29kZSA9IHRleHRbOjRdCisgICAgICAg ICAgICBtZXNzYWdlID0gdGV4dFs1Ol0KKyAgICAgICAgICAgIGNhdGVnb3J5ID0gInB5Y29kZXN0 eWxlLyIgKyBjb2RlCisgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IoCisgICAg ICAgICAgICAgICAgbGluZV9udW1iZXI9bGluZV9udW1iZXIsCisgICAgICAgICAgICAgICAgY2F0 ZWdvcnk9Y2F0ZWdvcnksCisgICAgICAgICAgICAgICAgY29uZmlkZW5jZT01LAorICAgICAgICAg ICAgICAgIG1lc3NhZ2U9bWVzc2FnZSwKKyAgICAgICAgICAgICkKKworICAgICAgICBjaGVja2Vy ID0gcHljb2Rlc3R5bGUuQ2hlY2tlcihzZWxmLl9maWxlX3BhdGgpCisgICAgICAgIGNoZWNrZXIu cmVwb3J0X2Vycm9yID0gaGFuZGxlcgorICAgICAgICBjaGVja2VyLmNoZWNrX2FsbCgpCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CShyZXZp c2lvbiAyNDc1MzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0 X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTkxLDYgKzkxLDggQEAgY2xhc3MgQXV0b2luc3RhbGxJ bXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX21lY2hhbml6ZSgp CiAgICAgICAgIGVsaWYgJy5wZXA4JyBpbiBmdWxsbmFtZToKICAgICAgICAgICAgIHNlbGYuX2lu c3RhbGxfcGVwOCgpCisgICAgICAgIGVsaWYgJy5weWNvZGVzdHlsZScgaW4gZnVsbG5hbWU6Cisg ICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5Y29kZXN0eWxlKCkKICAgICAgICAgZWxpZiAnLnB5 bGludCcgaW4gZnVsbG5hbWU6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5bGludCgpCiAg ICAgICAgIGVsaWYgJy5jb3ZlcmFnZScgaW4gZnVsbG5hbWU6CkBAIC0xMjksNiArMTMxLDkgQEAg Y2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgZGVmIF9pbnN0YWxsX3Bl cDgoc2VsZik6CiAgICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9z dGVkLm9yZy9wYWNrYWdlcy9zb3VyY2UvcC9wZXA4L3BlcDgtMC41LjAudGFyLmd6IiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgInBlcDgtMC41LjAvcGVwOC5weSIpCisgICAgZGVmIF9p bnN0YWxsX3B5Y29kZXN0eWxlKHNlbGYpOgorICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczov L2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvc291cmNlL3AvcHljb2Rlc3R5bGUvcHlj b2Rlc3R5bGUtMi41LjAudGFyLmd6IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInB5 Y29kZXN0eWxlLTIuNS4wL3B5Y29kZXN0eWxlLnB5IikKIAogICAgIGRlZiBfaW5zdGFsbF9tb3ps b2coc2VsZik6CiAgICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9z eXNfcGF0aCgpCg==