215156 2020-08-04 22:11:03 -0700 Make report-non-inclusive-language ignore files within .svn and .git 2020-10-20 10:54:50 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=217972 InRadar P2 Normal --- 1 bdakin webkit-unassigned bdakin darin webkit-bug-importer oldest_to_newest 1677883 0 bdakin 2020-08-04 22:11:03 -0700 Make report-non-inclusive-language ignore files within .svn and .git 1677885 1 405985 bdakin 2020-08-04 22:14:15 -0700 Created attachment 405985 Patch I'm not sure if this is the best way to do this… 1677997 2 405985 darin 2020-08-05 11:39:38 -0700 Comment on attachment 405985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405985&action=review > Tools/Scripts/report-non-inclusive-language:69 > + if prefix.find(".svn") >= 0: > + continue > + if prefix.find(".git") >= 0: > + continue 1. I suggest doing before the "for file in files:" loop, since it’s a check on the entire directory, not individual files. 2. I found documentation here <https://docs.python.org/2/library/stdtypes.html#string-methods> that says you can and should write this instead: if ".svn" in prefix: continue; 3. (This seems to supersede both 1 and 2 above.) II did a little research and found a different solution, a way to make os.walk not even recurse into these directories. We can write this in the os.walk loop (outside the "for file in files" loop): directories = [directory for directory in directories if not directory.startswith(".svn")] Then it will never even recurse into a that starts with .svn. Maybe there’s a nicer way to write it if you are a Python expert. 1678011 3 405985 bdakin 2020-08-05 11:57:51 -0700 Comment on attachment 405985 Patch Going to rewrite this for sure, so R- for now. 1678038 4 bdakin 2020-08-05 12:46:15 -0700 I might be being too much of a Python n00b here, but this patch did not work for me. .svn files were still traversed: Index: Scripts/report-non-inclusive-language =================================================================== --- Scripts/report-non-inclusive-language (revision 265267) +++ Scripts/report-non-inclusive-language (working copy) @@ -54,6 +55,7 @@ root = os.getcwd() for subroot, directories, files in os.walk(root): + directories = [directory for directory in directories if not directory.startswith(".svn")] prefix = subroot[len(root) + 1:] for file in files: if file.startswith("ChangeLog"): 1678040 5 darin 2020-08-05 12:50:28 -0700 OK, then land something that works, and we will figure this out later. 1678051 6 406029 bdakin 2020-08-05 13:07:45 -0700 Created attachment 406029 Patch Here's a patch the moves the directory check outside of the files loop. 1678052 7 406029 darin 2020-08-05 13:09:58 -0700 Comment on attachment 406029 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406029&action=review > Tools/Scripts/report-non-inclusive-language:58 > + directories = [directory for directory in directories if not directory.startswith(".svn")] Leave this out since it's not working yet > Tools/Scripts/report-non-inclusive-language:63 > + if prefix.find(".svn") >= 0: > + continue > + if prefix.find(".git") >= 0: > + continue Use this style: if ".svn" in prefix: 1678053 8 406030 bdakin 2020-08-05 13:18:36 -0700 Created attachment 406030 Patch Oh yeah, I forgot that part of the feedback. Thank you! 1678054 9 406030 darin 2020-08-05 13:23:52 -0700 Comment on attachment 406030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406030&action=review > Tools/Scripts/report-non-inclusive-language:58 > + directories = [directory for directory in directories if not directory.startswith(".svn")] Take this out since it’s not working? 1678055 10 406031 bdakin 2020-08-05 13:27:37 -0700 Created attachment 406031 Patch Fixing the sloppy! 1678072 11 ews-feeder 2020-08-05 14:08:10 -0700 Committed r265304: <https://trac.webkit.org/changeset/265304> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406031. 1678073 12 webkit-bug-importer 2020-08-05 14:09:18 -0700 <rdar://problem/66593010> 405985 2020-08-04 22:14:15 -0700 2020-08-05 13:07:45 -0700 Patch for-review.txt text/plain 1888 bdakin SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDIwLTA4LTA0ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlIGlnbm9yZSBmaWxlcyB3 aXRoaW4gLnN2biBhbmQgLmdpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1MTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlOgorCiAy MDIwLTA4LTA0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAg ICAgICAgIFt3ZWJraXRjb3JlcHldIFJFR1JFU1NJT04ocjI2NTI1NCk6IGF1dG9pbnN0YWxsZXIg aXMgZmFpbGluZyB0byBleGVjdXRlIHNldHVwLnB5IG9uIHdpbjMyIFB5dGhvbgpJbmRleDogVG9v bHMvU2NyaXB0cy9yZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCShyZXZpc2lvbiAyNjUy NjcpCisrKyBUb29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMyw3ICszMyw4IEBAIGltcG9ydCBhcmdwYXJzZSwgb3MsIHJlCiAjICAg Q2xldmVyIGRlZmF1bHQgZm9yIHVzZSBvbiBXZWJLaXQgc291cmNlIHRyZWUgaW5zdGVhZCBvZiBj dXJyZW50IGRpcmVjdG9yeSBieSBkZWZhdWx0LgogIyAgIFJlcG9ydCB0aGlyZCBwYXJ0eSBzb3Vy Y2VzIHNlcGFyYXRlbHkgZnJvbSBXZWJLaXQgcHJvamVjdCBmaWxlcy4KICMgICBTa2lwIGtub3du IGV4YW1wbGVzIG9uIGFuIGV4Y2VwdGlvbiBsaXN0IHRoYXQgd2UgZG9uJ3QgaW50ZW5kIHRvIGZp eC4KLSMgICBSZXBsYWNlIHNwZWNpYWwgY2FzZXMgZm9yIENoYW5nZUxvZywgIi5vcmRlciIsIGFu ZCAiLnhjdXNlcnN0YXRlIiBmaWxlcyB3aXRoIHNvbWV0aGluZyBzbWFydGVyLgorIyAgIFJlcGxh Y2Ugc3BlY2lhbCBjYXNlcyBmb3IgQ2hhbmdlTG9nLCAiLm9yZGVyIiwgIi54Y3VzZXJzdGF0ZSIs ICIuZ2l0IiwgIi5zdm4iCisjICAgZmlsZXMgd2l0aCBzb21ldGhpbmcgc21hcnRlci4KIAogIyBI YXJkLWNvZGVkIGZvciBub3csIGNvdWxkIHJlYWQgdGhlc2Ugb3V0IG9mIGEgZmlsZSBpbnN0ZWFk LgogIyBUZXJtLCB0aGVuIHRoZSByZWd1bGFyIGV4cHJlc3Npb24gZm9yIHRoYXQgdGVybS4KQEAg LTYyLDYgKzYzLDEwIEBAIGZvciBzdWJyb290LCBkaXJlY3RvcmllcywgZmlsZXMgaW4gb3Mud2EK ICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgIGlmIGZpbGUuZW5kc3dpdGgoIi54Y3VzZXJz dGF0ZSIpOgogICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgaWYgcHJlZml4LmZpbmQoIi5z dm4iKSA+PSAwOgorICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgaWYgcHJlZml4LmZpbmQo Ii5naXQiKSA+PSAwOgorICAgICAgICAgICAgY29udGludWUKICAgICAgICAgaGFuZGxlID0gb3Bl bihvcy5wYXRoLmpvaW4oc3Vicm9vdCwgZmlsZSksICJyIikKICAgICAgICAgZm9yIGxpbmUgaW4g aGFuZGxlLnJlYWRsaW5lcygpOgogICAgICAgICAgICAgZm9yIHRlcm0gaW4gbm9uSW5jbHVzaXZl VGVybXM6Cg== 406029 2020-08-05 13:07:45 -0700 2020-08-05 13:18:36 -0700 Patch for-review-2.txt text/plain 1928 bdakin SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDIwLTA4LTA0ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlIGlnbm9yZSBmaWxlcyB3 aXRoaW4gLnN2biBhbmQgLmdpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1MTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlOgorCiAy MDIwLTA4LTA0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAg ICAgICAgIFt3ZWJraXRjb3JlcHldIFJFR1JFU1NJT04ocjI2NTI1NCk6IGF1dG9pbnN0YWxsZXIg aXMgZmFpbGluZyB0byBleGVjdXRlIHNldHVwLnB5IG9uIHdpbjMyIFB5dGhvbgpJbmRleDogVG9v bHMvU2NyaXB0cy9yZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCShyZXZpc2lvbiAyNjUy NjcpCisrKyBUb29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMyw3ICszMyw4IEBAIGltcG9ydCBhcmdwYXJzZSwgb3MsIHJlCiAjICAg Q2xldmVyIGRlZmF1bHQgZm9yIHVzZSBvbiBXZWJLaXQgc291cmNlIHRyZWUgaW5zdGVhZCBvZiBj dXJyZW50IGRpcmVjdG9yeSBieSBkZWZhdWx0LgogIyAgIFJlcG9ydCB0aGlyZCBwYXJ0eSBzb3Vy Y2VzIHNlcGFyYXRlbHkgZnJvbSBXZWJLaXQgcHJvamVjdCBmaWxlcy4KICMgICBTa2lwIGtub3du IGV4YW1wbGVzIG9uIGFuIGV4Y2VwdGlvbiBsaXN0IHRoYXQgd2UgZG9uJ3QgaW50ZW5kIHRvIGZp eC4KLSMgICBSZXBsYWNlIHNwZWNpYWwgY2FzZXMgZm9yIENoYW5nZUxvZywgIi5vcmRlciIsIGFu ZCAiLnhjdXNlcnN0YXRlIiBmaWxlcyB3aXRoIHNvbWV0aGluZyBzbWFydGVyLgorIyAgIFJlcGxh Y2Ugc3BlY2lhbCBjYXNlcyBmb3IgQ2hhbmdlTG9nLCAiLm9yZGVyIiwgIi54Y3VzZXJzdGF0ZSIs ICIuZ2l0IiwgIi5zdm4iCisjICAgZmlsZXMgd2l0aCBzb21ldGhpbmcgc21hcnRlci4KIAogIyBI YXJkLWNvZGVkIGZvciBub3csIGNvdWxkIHJlYWQgdGhlc2Ugb3V0IG9mIGEgZmlsZSBpbnN0ZWFk LgogIyBUZXJtLCB0aGVuIHRoZSByZWd1bGFyIGV4cHJlc3Npb24gZm9yIHRoYXQgdGVybS4KQEAg LTU0LDcgKzU1LDEyIEBAIGZvciB0ZXJtIGluIG5vbkluY2x1c2l2ZVRlcm1zOgogCiByb290ID0g b3MuZ2V0Y3dkKCkKIGZvciBzdWJyb290LCBkaXJlY3RvcmllcywgZmlsZXMgaW4gb3Mud2Fsayhy b290KToKKyAgICBkaXJlY3RvcmllcyA9IFtkaXJlY3RvcnkgZm9yIGRpcmVjdG9yeSBpbiBkaXJl Y3RvcmllcyBpZiBub3QgZGlyZWN0b3J5LnN0YXJ0c3dpdGgoIi5zdm4iKV0KICAgICBwcmVmaXgg PSBzdWJyb290W2xlbihyb290KSArIDE6XQorICAgIGlmIHByZWZpeC5maW5kKCIuc3ZuIikgPj0g MDoKKyAgICAgICAgY29udGludWUKKyAgICBpZiBwcmVmaXguZmluZCgiLmdpdCIpID49IDA6Cisg ICAgICAgIGNvbnRpbnVlCiAgICAgZm9yIGZpbGUgaW4gZmlsZXM6CiAgICAgICAgIGlmIGZpbGUu c3RhcnRzd2l0aCgiQ2hhbmdlTG9nIik6CiAgICAgICAgICAgICBjb250aW51ZQo= 406030 2020-08-05 13:18:36 -0700 2020-08-05 13:27:37 -0700 Patch for-review-3.txt text/plain 1912 bdakin SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDIwLTA4LTA0ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlIGlnbm9yZSBmaWxlcyB3 aXRoaW4gLnN2biBhbmQgLmdpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1MTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlOgorCiAy MDIwLTA4LTA0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAg ICAgICAgIFt3ZWJraXRjb3JlcHldIFJFR1JFU1NJT04ocjI2NTI1NCk6IGF1dG9pbnN0YWxsZXIg aXMgZmFpbGluZyB0byBleGVjdXRlIHNldHVwLnB5IG9uIHdpbjMyIFB5dGhvbgpJbmRleDogVG9v bHMvU2NyaXB0cy9yZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCShyZXZpc2lvbiAyNjUy NjcpCisrKyBUb29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMyw3ICszMyw4IEBAIGltcG9ydCBhcmdwYXJzZSwgb3MsIHJlCiAjICAg Q2xldmVyIGRlZmF1bHQgZm9yIHVzZSBvbiBXZWJLaXQgc291cmNlIHRyZWUgaW5zdGVhZCBvZiBj dXJyZW50IGRpcmVjdG9yeSBieSBkZWZhdWx0LgogIyAgIFJlcG9ydCB0aGlyZCBwYXJ0eSBzb3Vy Y2VzIHNlcGFyYXRlbHkgZnJvbSBXZWJLaXQgcHJvamVjdCBmaWxlcy4KICMgICBTa2lwIGtub3du IGV4YW1wbGVzIG9uIGFuIGV4Y2VwdGlvbiBsaXN0IHRoYXQgd2UgZG9uJ3QgaW50ZW5kIHRvIGZp eC4KLSMgICBSZXBsYWNlIHNwZWNpYWwgY2FzZXMgZm9yIENoYW5nZUxvZywgIi5vcmRlciIsIGFu ZCAiLnhjdXNlcnN0YXRlIiBmaWxlcyB3aXRoIHNvbWV0aGluZyBzbWFydGVyLgorIyAgIFJlcGxh Y2Ugc3BlY2lhbCBjYXNlcyBmb3IgQ2hhbmdlTG9nLCAiLm9yZGVyIiwgIi54Y3VzZXJzdGF0ZSIs ICIuZ2l0IiwgIi5zdm4iCisjICAgZmlsZXMgd2l0aCBzb21ldGhpbmcgc21hcnRlci4KIAogIyBI YXJkLWNvZGVkIGZvciBub3csIGNvdWxkIHJlYWQgdGhlc2Ugb3V0IG9mIGEgZmlsZSBpbnN0ZWFk LgogIyBUZXJtLCB0aGVuIHRoZSByZWd1bGFyIGV4cHJlc3Npb24gZm9yIHRoYXQgdGVybS4KQEAg LTU0LDcgKzU1LDEyIEBAIGZvciB0ZXJtIGluIG5vbkluY2x1c2l2ZVRlcm1zOgogCiByb290ID0g b3MuZ2V0Y3dkKCkKIGZvciBzdWJyb290LCBkaXJlY3RvcmllcywgZmlsZXMgaW4gb3Mud2Fsayhy b290KToKKyAgICBkaXJlY3RvcmllcyA9IFtkaXJlY3RvcnkgZm9yIGRpcmVjdG9yeSBpbiBkaXJl Y3RvcmllcyBpZiBub3QgZGlyZWN0b3J5LnN0YXJ0c3dpdGgoIi5zdm4iKV0KICAgICBwcmVmaXgg PSBzdWJyb290W2xlbihyb290KSArIDE6XQorICAgIGlmICIuc3ZuIiBpbiBwcmVmaXg6CisgICAg ICAgIGNvbnRpbnVlCisgICAgaWYgIi5naXQiIGluIHByZWZpeDoKKyAgICAgICAgY29udGludWUK ICAgICBmb3IgZmlsZSBpbiBmaWxlczoKICAgICAgICAgaWYgZmlsZS5zdGFydHN3aXRoKCJDaGFu Z2VMb2ciKToKICAgICAgICAgICAgIGNvbnRpbnVlCg== 406031 2020-08-05 13:27:37 -0700 2020-08-05 14:08:10 -0700 Patch for-review-4.txt text/plain 1814 bdakin SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDIwLTA4LTA0ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlIGlnbm9yZSBmaWxlcyB3 aXRoaW4gLnN2biBhbmQgLmdpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1MTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlOgorCiAy MDIwLTA4LTA0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAg ICAgICAgIFt3ZWJraXRjb3JlcHldIFJFR1JFU1NJT04ocjI2NTI1NCk6IGF1dG9pbnN0YWxsZXIg aXMgZmFpbGluZyB0byBleGVjdXRlIHNldHVwLnB5IG9uIHdpbjMyIFB5dGhvbgpJbmRleDogVG9v bHMvU2NyaXB0cy9yZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCShyZXZpc2lvbiAyNjUy NjcpCisrKyBUb29scy9TY3JpcHRzL3JlcG9ydC1ub24taW5jbHVzaXZlLWxhbmd1YWdlCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMyw3ICszMyw4IEBAIGltcG9ydCBhcmdwYXJzZSwgb3MsIHJlCiAjICAg Q2xldmVyIGRlZmF1bHQgZm9yIHVzZSBvbiBXZWJLaXQgc291cmNlIHRyZWUgaW5zdGVhZCBvZiBj dXJyZW50IGRpcmVjdG9yeSBieSBkZWZhdWx0LgogIyAgIFJlcG9ydCB0aGlyZCBwYXJ0eSBzb3Vy Y2VzIHNlcGFyYXRlbHkgZnJvbSBXZWJLaXQgcHJvamVjdCBmaWxlcy4KICMgICBTa2lwIGtub3du IGV4YW1wbGVzIG9uIGFuIGV4Y2VwdGlvbiBsaXN0IHRoYXQgd2UgZG9uJ3QgaW50ZW5kIHRvIGZp eC4KLSMgICBSZXBsYWNlIHNwZWNpYWwgY2FzZXMgZm9yIENoYW5nZUxvZywgIi5vcmRlciIsIGFu ZCAiLnhjdXNlcnN0YXRlIiBmaWxlcyB3aXRoIHNvbWV0aGluZyBzbWFydGVyLgorIyAgIFJlcGxh Y2Ugc3BlY2lhbCBjYXNlcyBmb3IgQ2hhbmdlTG9nLCAiLm9yZGVyIiwgIi54Y3VzZXJzdGF0ZSIs ICIuZ2l0IiwgIi5zdm4iCisjICAgZmlsZXMgd2l0aCBzb21ldGhpbmcgc21hcnRlci4KIAogIyBI YXJkLWNvZGVkIGZvciBub3csIGNvdWxkIHJlYWQgdGhlc2Ugb3V0IG9mIGEgZmlsZSBpbnN0ZWFk LgogIyBUZXJtLCB0aGVuIHRoZSByZWd1bGFyIGV4cHJlc3Npb24gZm9yIHRoYXQgdGVybS4KQEAg LTU1LDYgKzU2LDEwIEBAIGZvciB0ZXJtIGluIG5vbkluY2x1c2l2ZVRlcm1zOgogcm9vdCA9IG9z LmdldGN3ZCgpCiBmb3Igc3Vicm9vdCwgZGlyZWN0b3JpZXMsIGZpbGVzIGluIG9zLndhbGsocm9v dCk6CiAgICAgcHJlZml4ID0gc3Vicm9vdFtsZW4ocm9vdCkgKyAxOl0KKyAgICBpZiAiLnN2biIg aW4gcHJlZml4OgorICAgICAgICBjb250aW51ZQorICAgIGlmICIuZ2l0IiBpbiBwcmVmaXg6Cisg ICAgICAgIGNvbnRpbnVlCiAgICAgZm9yIGZpbGUgaW4gZmlsZXM6CiAgICAgICAgIGlmIGZpbGUu c3RhcnRzd2l0aCgiQ2hhbmdlTG9nIik6CiAgICAgICAgICAgICBjb250aW51ZQo=