190258 2018-10-03 12:52:02 -0700 [GTK] build fails with python 3 if LANG and LC_TYPE are unset 2018-10-05 03:57:33 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Linux RESOLVED FIXED InRadar P2 Normal --- 1 mgorse webkit-unassigned annulen bugs-noreply commit-queue ews-watchlist keith_miller lforschler mark.lam mcatanzaro mgorse msaboff saam webkit-bug-importer oldest_to_newest 1466155 0 mgorse 2018-10-03 12:52:02 -0700 Building the gtk port still fails using Python 3 if LANG or LC_TYPE do not specify UTF-8. I'm seeing tracebacks such as the following: Traceback (most recent call last): File "/home/mgorse/src/WebKit/Source/JavaScriptCore/Scripts/generateIntlCanonicalizeLanguage.py", line 197, in <module> registry.parse(registryFile) File "/home/mgorse/src/WebKit/Source/JavaScriptCore/Scripts/generateIntlCanonicalizeLanguage.py", line 63, in parse for line in file: File "/usr/lib64/python3.6/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 866: ordinal not in range(128) 1466157 1 351542 mgorse 2018-10-03 13:05:08 -0700 Created attachment 351542 Proposed patch. Explicitly specify UTF-8 encoding for Python 3 in some places, rather than defaulting to the encoding specified in the environment. 1466158 2 351542 mark.lam 2018-10-03 13:22:58 -0700 Comment on attachment 351542 Proposed patch. LGTM but let's wait for the EWS bots to be green before committing. 1466169 3 351542 annulen 2018-10-03 13:53:03 -0700 Comment on attachment 351542 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=351542&action=review > Source/JavaScriptCore/Scripts/cssmin.py:51 > + sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='UTF-8') These lines duplicate code above 1466261 4 mgorse 2018-10-03 18:21:09 -0700 (In reply to Konstantin Tokarev from comment #3) > Comment on attachment 351542 [details] > Proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351542&action=review > > > Source/JavaScriptCore/Scripts/cssmin.py:51 > > + sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='UTF-8') > > These lines duplicate code above I think you're referring to this line: sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='UTF-8') My patch adds similar handling for sys.stdout. 1466278 5 351542 annulen 2018-10-03 18:59:49 -0700 Comment on attachment 351542 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=351542&action=review >>> Source/JavaScriptCore/Scripts/cssmin.py:51 >>> + sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='UTF-8') >> >> These lines duplicate code above > > I think you're referring to this line: > sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='UTF-8') > My patch adds similar handling for sys.stdout. Oh, sorry. Still I think it would be better to avoid duplication of 'sys.version_info[0] >= 3' and 'import io' to prevent misreads 1466577 6 351643 mgorse 2018-10-04 16:59:17 -0700 Created attachment 351643 Updated patch. Updated cssmin.py to remove duplicated if check and import. 1466647 7 mcatanzaro 2018-10-05 02:02:09 -0700 If you keep the previous reviewed by line when you upload it (either by adding it manually or by applying it with 'webkit-patch apply-from-bug') then any committer would be able to commit it without waiting for Konstantin again. 1466653 8 351643 commit-queue 2018-10-05 03:56:39 -0700 Comment on attachment 351643 Updated patch. Clearing flags on attachment: 351643 Committed r236870: <https://trac.webkit.org/changeset/236870> 1466654 9 commit-queue 2018-10-05 03:56:41 -0700 All reviewed patches have been landed. Closing bug. 1466655 10 webkit-bug-importer 2018-10-05 03:57:33 -0700 <rdar://problem/45038771> 351542 2018-10-03 13:05:08 -0700 2018-10-04 16:59:17 -0700 Proposed patch. encoding.patch text/plain 4416 mgorse RnJvbSBjOTRhZDMwOThmMTU5OGYwZDQyZDQyYmFmODA5ZDU5MjA5MjY0YzYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEdvcnNlIDxtZ29yc2VAYWx1bS53cGkuZWR1PgpEYXRl OiBXZWQsIDMgT2N0IDIwMTggMTU6MDE6MTkgLTA1MDAKU3ViamVjdDogW1BBVENIXSBTcGVjaWZ5 IFVURi04IGVuY29kaW5nIG9uIFB5dGhvbiAzIGluIHNvbWUgcGxhY2VzLgoKLS0tCiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgfCAxMyArKysrKysr KysrKysrCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9jc3NtaW4ucHkgICAgICAgICAg ICAgfCAgNSArKysrLQogLi4uL1NjcmlwdHMvZ2VuZXJhdGVJbnRsQ2Fub25pY2FsaXplTGFuZ3Vh Z2UucHkgICAgIHwgIDUgKysrKy0KIC4uLi95YXJyL2dlbmVyYXRlWWFyckNhbm9uaWNhbGl6ZVVu aWNvZGUgICAgICAgICAgICB8ICA1ICsrKystCiAuLi4veWFyci9nZW5lcmF0ZVlhcnJVbmljb2Rl UHJvcGVydHlUYWJsZXMucHkgICAgICAgfCAgNSArKysrLQogNSBmaWxlcyBjaGFuZ2VkLCAyOSBp bnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4 IDExZDRmMzFjNWUyLi5jOGI2OWRjZDUxMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMTgtMTAtMDMgIE1pa2UgR29yc2UgIDxtZ29yc2VAYWx1bS53cGkuZWR1 PgorCisgICAgICAgIEd0ayBidWlsZCBmYWlscyB3aXRoIHB5dGhvbiAzIGlmIExBTkcgYW5kIExD X1RZUEUgYXJlIHVuc2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTAyNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvY3NzbWluLnB5OiBTZXQgc3Rkb3V0IHRvIFVURi04IG9uIHB5dGhv biAzLgorICAgICAgICAqIFNjcmlwdHMvZ2VuZXJhdGVJbnRsQ2Fub25pY2FsaXplTGFuZ3VhZ2Uu cHk6IE9wZW4gZmlsZXMgd2l0aAorICAgICAgICAgIGVuY29kaW5nPVVURi04IG9uIFB5dGhvbiAz LgorICAgICAgICAqIHlhcnIvZ2VuZXJhdGVZYXJyQ2Fub25pY2FsaXplVW5pY29kZTogRGl0dG8u CisgICAgICAgICogeWFyci9nZW5lcmF0ZVlhcnJVbmljb2RlUHJvcGVydHlUYWJsZXMucHk6IERp dHRvLgorCiAyMDE4LTEwLTAzICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAg ICAgICAgSmF2YVNjcmlwdENvcmUgcGFydCBvZiBbWGNvZGVdIFVwZGF0ZSBzb21lIGJ1aWxkIHNl dHRpbmdzIGFzIHJlY29tbWVuZGVkIGJ5IFhjb2RlIDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvU2NyaXB0cy9jc3NtaW4ucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2Ny aXB0cy9jc3NtaW4ucHkKaW5kZXggYzM0Y2QwODFiOTQuLmMwZWNlNDJkNGY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9jc3NtaW4ucHkKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL1NjcmlwdHMvY3NzbWluLnB5CkBAIC00Myw3ICs0MywxMCBAQCBkZWYgY3Nz bWluaWZ5KGNzcyk6CiAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgaW1wb3J0IHN5 cwotICAgIGlmIHN5cy52ZXJzaW9uX2luZm9bMF0gPT0gMyBhbmQgc3lzLnN0ZGluLmVuY29kaW5n ICE9ICdVVEYtOCc6CisgICAgaWYgc3lzLnZlcnNpb25faW5mb1swXSA+PSAzIGFuZCBzeXMuc3Rk aW4uZW5jb2RpbmcgIT0gJ1VURi04JzoKICAgICAgICAgaW1wb3J0IGlvCiAgICAgICAgIHN5cy5z dGRpbiA9IGlvLlRleHRJT1dyYXBwZXIoc3lzLnN0ZGluLmJ1ZmZlciwgZW5jb2Rpbmc9J1VURi04 JykKKyAgICBpZiBzeXMudmVyc2lvbl9pbmZvWzBdID49IDMgYW5kIHN5cy5zdGRvdXQuZW5jb2Rp bmcgIT0gJ1VURi04JzoKKyAgICAgICAgaW1wb3J0IGlvCisgICAgICAgIHN5cy5zdGRvdXQgPSBp by5UZXh0SU9XcmFwcGVyKHN5cy5zdGRvdXQuYnVmZmVyLCBlbmNvZGluZz0nVVRGLTgnKQogICAg IHN5cy5zdGRvdXQud3JpdGUoY3NzbWluaWZ5KHN5cy5zdGRpbi5yZWFkKCkpKQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1NjcmlwdHMvZ2VuZXJhdGVJbnRsQ2Fub25pY2FsaXpl TGFuZ3VhZ2UucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9nZW5lcmF0ZUludGxD YW5vbmljYWxpemVMYW5ndWFnZS5weQppbmRleCA5NDliMGI2ZTc1YS4uNzFkZjE4NGJkYTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2dlbmVyYXRlSW50bENhbm9u aWNhbGl6ZUxhbmd1YWdlLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2dl bmVyYXRlSW50bENhbm9uaWNhbGl6ZUxhbmd1YWdlLnB5CkBAIC00NCw3ICs0NCwxMCBAQCBmb290 ZXIgPSAiIiIKIAogZGVmIG9wZW5PckV4aXQocGF0aCwgbW9kZSk6CiAgICAgdHJ5OgotICAgICAg ICByZXR1cm4gb3BlbihwYXRoLCBtb2RlKQorICAgICAgICBpZiBzeXMudmVyc2lvbl9pbmZvLm1h am9yID49IDM6CisgICAgICAgICAgICByZXR1cm4gb3BlbihwYXRoLCBtb2RlLCBlbmNvZGluZz0i VVRGLTgiKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcmV0dXJuIG9wZW4ocGF0aCwgbW9k ZSkKICAgICBleGNlcHQgSU9FcnJvciBhcyBlOgogICAgICAgICBwcmludCgiSS9PIGVycm9yIG9w ZW5pbmcgezB9LCAoezF9KTogezJ9Ii5mb3JtYXQocGF0aCwgZS5lcnJubywgZS5zdHJlcnJvcikp CiAgICAgICAgIGV4aXQoMSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJy L2dlbmVyYXRlWWFyckNhbm9uaWNhbGl6ZVVuaWNvZGUgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv eWFyci9nZW5lcmF0ZVlhcnJDYW5vbmljYWxpemVVbmljb2RlCmluZGV4IGI4OTc3Nzk1NzUxLi45 NTU0OWM3ZWI1NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvZ2VuZXJh dGVZYXJyQ2Fub25pY2FsaXplVW5pY29kZQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9nZW5lcmF0ZVlhcnJDYW5vbmljYWxpemVVbmljb2RlCkBAIC03Nyw3ICs3NywxMCBAQCBkZWYg b3Blbk9yRXhpdChwYXRoLCBtb2RlKToKICAgICAgICAgZGlybmFtZSA9IG9zLnBhdGguZGlybmFt ZShwYXRoKQogICAgICAgICBpZiBub3Qgb3MucGF0aC5pc2RpcihkaXJuYW1lKToKICAgICAgICAg ICAgIG9zLm1ha2VkaXJzKGRpcm5hbWUpCi0gICAgICAgIHJldHVybiBvcGVuKHBhdGgsIG1vZGUp CisgICAgICAgIGlmIHN5cy52ZXJzaW9uX2luZm8ubWFqb3IgPj0gMzoKKyAgICAgICAgICAgIHJl dHVybiBvcGVuKHBhdGgsIG1vZGUsIGVuY29kaW5nPSJVVEYtOCIpCisgICAgICAgIGVsc2U6Cisg ICAgICAgICAgICByZXR1cm4gb3BlbihwYXRoLCBtb2RlKQogICAgIGV4Y2VwdCBJT0Vycm9yIGFz IGU6CiAgICAgICAgIHByaW50KCJJL08gZXJyb3Igb3BlbmluZyB7MH0sICh7MX0pOiB7Mn0iLmZv cm1hdChwYXRoLCBlLmVycm5vLCBlLnN0cmVycm9yKSkKICAgICAgICAgZXhpdCgxKQpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvZ2VuZXJhdGVZYXJyVW5pY29kZVByb3Bl cnR5VGFibGVzLnB5IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvZ2VuZXJhdGVZYXJyVW5p Y29kZVByb3BlcnR5VGFibGVzLnB5CmluZGV4IGNlYjVjOGY0ZjIwLi45MGY2NzMyNmZkMSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvZ2VuZXJhdGVZYXJyVW5pY29kZVBy b3BlcnR5VGFibGVzLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL2dlbmVyYXRl WWFyclVuaWNvZGVQcm9wZXJ0eVRhYmxlcy5weQpAQCAtOTAsNyArOTAsMTAgQEAgYWxpYXNlcyA9 IE5vbmUKIAogZGVmIG9wZW5PckV4aXQocGF0aCwgbW9kZSk6CiAgICAgdHJ5OgotICAgICAgICBy ZXR1cm4gb3BlbihwYXRoLCBtb2RlKQorICAgICAgICBpZiBzeXMudmVyc2lvbl9pbmZvLm1ham9y ID49IDM6CisgICAgICAgICAgICByZXR1cm4gb3BlbihwYXRoLCBtb2RlLCBlbmNvZGluZz0iVVRG LTgiKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcmV0dXJuIG9wZW4ocGF0aCwgbW9kZSkK ICAgICBleGNlcHQgSU9FcnJvciBhcyBlOgogICAgICAgICBwcmludCgiSS9PIGVycm9yIG9wZW5p bmcgezB9LCAoezF9KTogezJ9Ii5mb3JtYXQocGF0aCwgZS5lcnJubywgZS5zdHJlcnJvcikpCiAg ICAgICAgIGV4aXQoMSkKLS0gCjIuMTguMAoK 351643 2018-10-04 16:59:17 -0700 2018-10-05 03:56:39 -0700 Updated patch. encoding.patch text/plain 4474 mgorse RnJvbSBiYzUwOGQwYWFlOTU5ZmI1Zjc0NTZkMDg1NzhiZjVlOWZiZGVjODlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEdvcnNlIDxtZ29yc2VAYWx1bS53cGkuZWR1PgpEYXRl OiBUaHUsIDQgT2N0IDIwMTggMTg6NTY6NDkgLTA1MDAKU3ViamVjdDogW1BBVENIXSBTcGVjaWZ5 IFVURi04IGVuY29kaW5nIG9uIHB5dGhvbiAzIGluIHNvbWUgcGxhY2VzCgotLS0KIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICB8IDEzICsrKysrKysr KysrKysKIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2Nzc21pbi5weSAgICAgICAgICAg ICB8ICA3ICsrKysrLS0KIC4uLi9TY3JpcHRzL2dlbmVyYXRlSW50bENhbm9uaWNhbGl6ZUxhbmd1 YWdlLnB5ICAgICB8ICA1ICsrKystCiAuLi4veWFyci9nZW5lcmF0ZVlhcnJDYW5vbmljYWxpemVV bmljb2RlICAgICAgICAgICAgfCAgNSArKysrLQogLi4uL3lhcnIvZ2VuZXJhdGVZYXJyVW5pY29k ZVByb3BlcnR5VGFibGVzLnB5ICAgICAgIHwgIDUgKysrKy0KIDUgZmlsZXMgY2hhbmdlZCwgMzAg aW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRl eCAzMDRiM2RkZWMxZC4uNjNkNDg2NTA4YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDE4LTEwLTA0ICBNaWtlIEdvcnNlICA8bWdvcnNlQGFsdW0ud3BpLmVk dT4KKworICAgICAgICBbR1RLXSBidWlsZCBmYWlscyB3aXRoIHB5dGhvbiAzIGlmIExBTkcgYW5k IExDX1RZUEUgYXJlIHVuc2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTAyNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNjcmlwdHMvY3NzbWluLnB5OiBTZXQgc3Rkb3V0IHRvIFVURi04IG9uIHB5 dGhvbiAzLgorICAgICAgICAqIFNjcmlwdHMvZ2VuZXJhdGVJbnRsQ2Fub25pY2FsaXplTGFuZ3Vh Z2UucHk6IE9wZW4gZmlsZXMgd2l0aAorICAgICAgICAgIGVuY29kaW5nPVVURi04IG9uIFB5dGhv biAzLgorICAgICAgICAqIHlhcnIvZ2VuZXJhdGVZYXJyQ2Fub25pY2FsaXplVW5pY29kZTogRGl0 dG8uCisgICAgICAgICogeWFyci9nZW5lcmF0ZVlhcnJVbmljb2RlUHJvcGVydHlUYWJsZXMucHk6 IERpdHRvLgorCiAyMDE4LTEwLTA0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAog ICAgICAgICBEaXNhYmxlIE9wdGlvbnM6OnVzZVdlYkFzc2VtYmx5RmFzdE1lbW9yeSgpIG9uIGxp bnV4IGlmIEFTQU4gc2lnbmFsIGhhbmRsaW5nIGlzIG5vdCBkaXNhYmxlZC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2Nzc21pbi5weSBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9TY3JpcHRzL2Nzc21pbi5weQppbmRleCBjMzRjZDA4MWI5NC4uOTYyMTNjYTg3MDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2Nzc21pbi5weQorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9jc3NtaW4ucHkKQEAgLTQzLDcgKzQzLDEw IEBAIGRlZiBjc3NtaW5pZnkoY3NzKToKIAogaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAg ICBpbXBvcnQgc3lzCi0gICAgaWYgc3lzLnZlcnNpb25faW5mb1swXSA9PSAzIGFuZCBzeXMuc3Rk aW4uZW5jb2RpbmcgIT0gJ1VURi04JzoKKyAgICBpZiBzeXMudmVyc2lvbl9pbmZvWzBdID49IDM6 CiAgICAgICAgIGltcG9ydCBpbwotICAgICAgICBzeXMuc3RkaW4gPSBpby5UZXh0SU9XcmFwcGVy KHN5cy5zdGRpbi5idWZmZXIsIGVuY29kaW5nPSdVVEYtOCcpCisgICAgICAgIGlmIHN5cy5zdGRp bi5lbmNvZGluZyAhPSAnVVRGLTgnOgorICAgICAgICAgICAgc3lzLnN0ZGluID0gaW8uVGV4dElP V3JhcHBlcihzeXMuc3RkaW4uYnVmZmVyLCBlbmNvZGluZz0nVVRGLTgnKQorICAgICAgICBpZiBz eXMuc3Rkb3V0LmVuY29kaW5nICE9ICdVVEYtOCc6CisgICAgICAgICAgICBzeXMuc3Rkb3V0ID0g aW8uVGV4dElPV3JhcHBlcihzeXMuc3Rkb3V0LmJ1ZmZlciwgZW5jb2Rpbmc9J1VURi04JykKICAg ICBzeXMuc3Rkb3V0LndyaXRlKGNzc21pbmlmeShzeXMuc3RkaW4ucmVhZCgpKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2dlbmVyYXRlSW50bENhbm9uaWNhbGl6 ZUxhbmd1YWdlLnB5IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1NjcmlwdHMvZ2VuZXJhdGVJbnRs Q2Fub25pY2FsaXplTGFuZ3VhZ2UucHkKaW5kZXggOTQ5YjBiNmU3NWEuLjcxZGYxODRiZGE0IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9nZW5lcmF0ZUludGxDYW5v bmljYWxpemVMYW5ndWFnZS5weQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9n ZW5lcmF0ZUludGxDYW5vbmljYWxpemVMYW5ndWFnZS5weQpAQCAtNDQsNyArNDQsMTAgQEAgZm9v dGVyID0gIiIiCiAKIGRlZiBvcGVuT3JFeGl0KHBhdGgsIG1vZGUpOgogICAgIHRyeToKLSAgICAg ICAgcmV0dXJuIG9wZW4ocGF0aCwgbW9kZSkKKyAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mby5t YWpvciA+PSAzOgorICAgICAgICAgICAgcmV0dXJuIG9wZW4ocGF0aCwgbW9kZSwgZW5jb2Rpbmc9 IlVURi04IikKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHJldHVybiBvcGVuKHBhdGgsIG1v ZGUpCiAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKICAgICAgICAgcHJpbnQoIkkvTyBlcnJvciBv cGVuaW5nIHswfSwgKHsxfSk6IHsyfSIuZm9ybWF0KHBhdGgsIGUuZXJybm8sIGUuc3RyZXJyb3Ip KQogICAgICAgICBleGl0KDEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9nZW5lcmF0ZVlhcnJDYW5vbmljYWxpemVVbmljb2RlIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3lhcnIvZ2VuZXJhdGVZYXJyQ2Fub25pY2FsaXplVW5pY29kZQppbmRleCBiODk3Nzc5NTc1MS4u OTU1NDljN2ViNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL2dlbmVy YXRlWWFyckNhbm9uaWNhbGl6ZVVuaWNvZGUKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lh cnIvZ2VuZXJhdGVZYXJyQ2Fub25pY2FsaXplVW5pY29kZQpAQCAtNzcsNyArNzcsMTAgQEAgZGVm IG9wZW5PckV4aXQocGF0aCwgbW9kZSk6CiAgICAgICAgIGRpcm5hbWUgPSBvcy5wYXRoLmRpcm5h bWUocGF0aCkKICAgICAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIoZGlybmFtZSk6CiAgICAgICAg ICAgICBvcy5tYWtlZGlycyhkaXJuYW1lKQotICAgICAgICByZXR1cm4gb3BlbihwYXRoLCBtb2Rl KQorICAgICAgICBpZiBzeXMudmVyc2lvbl9pbmZvLm1ham9yID49IDM6CisgICAgICAgICAgICBy ZXR1cm4gb3BlbihwYXRoLCBtb2RlLCBlbmNvZGluZz0iVVRGLTgiKQorICAgICAgICBlbHNlOgor ICAgICAgICAgICAgcmV0dXJuIG9wZW4ocGF0aCwgbW9kZSkKICAgICBleGNlcHQgSU9FcnJvciBh cyBlOgogICAgICAgICBwcmludCgiSS9PIGVycm9yIG9wZW5pbmcgezB9LCAoezF9KTogezJ9Ii5m b3JtYXQocGF0aCwgZS5lcnJubywgZS5zdHJlcnJvcikpCiAgICAgICAgIGV4aXQoMSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL2dlbmVyYXRlWWFyclVuaWNvZGVQcm9w ZXJ0eVRhYmxlcy5weSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL2dlbmVyYXRlWWFyclVu aWNvZGVQcm9wZXJ0eVRhYmxlcy5weQppbmRleCBjZWI1YzhmNGYyMC4uOTBmNjczMjZmZDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL2dlbmVyYXRlWWFyclVuaWNvZGVQ cm9wZXJ0eVRhYmxlcy5weQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9nZW5lcmF0 ZVlhcnJVbmljb2RlUHJvcGVydHlUYWJsZXMucHkKQEAgLTkwLDcgKzkwLDEwIEBAIGFsaWFzZXMg PSBOb25lCiAKIGRlZiBvcGVuT3JFeGl0KHBhdGgsIG1vZGUpOgogICAgIHRyeToKLSAgICAgICAg cmV0dXJuIG9wZW4ocGF0aCwgbW9kZSkKKyAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mby5tYWpv ciA+PSAzOgorICAgICAgICAgICAgcmV0dXJuIG9wZW4ocGF0aCwgbW9kZSwgZW5jb2Rpbmc9IlVU Ri04IikKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHJldHVybiBvcGVuKHBhdGgsIG1vZGUp CiAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKICAgICAgICAgcHJpbnQoIkkvTyBlcnJvciBvcGVu aW5nIHswfSwgKHsxfSk6IHsyfSIuZm9ybWF0KHBhdGgsIGUuZXJybm8sIGUuc3RyZXJyb3IpKQog ICAgICAgICBleGl0KDEpCi0tIAoyLjE4LjAKCg==