126702 2014-01-09 08:29:36 -0800 REGRESSION (r160085): check-webkit-style: utf8' codec can't decode byte 0x89 in position 0: invalid start byte 2014-01-15 02:26:21 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbates webkit-unassigned ap changseok commit-queue galpeter gbalogh.u-szeged glenn llango.u-szeged mmaxfield ossy tgergely.u-szeged zherczeg oldest_to_newest 965914 0 dbates 2014-01-09 08:29:36 -0800 When style bot/check-webkit-style processed attachment 220739 (bug #126698) it died with the the following backtrace: Traceback (most recent call last): File "Tools/Scripts/check-webkit-style", line 48, in <module> sys.exit(CheckWebKitStyle().main()) File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/main.py", line 154, in main patch_checker.check(patch) File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/patchreader.py", line 71, in check self._text_file_reader.process_file(file_path=path, line_numbers=None) File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/filereader.py", line 118, in process_file lines = self._read_lines(file_path) File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/filereader.py", line 86, in _read_lines contents = file.read() File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/codecs.py", line 671, in read return self.reader.read(size) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/codecs.py", line 477, in read newchars, decodedbytes = self.decode(data, self.errors) UnicodeDecodeError: 'utf8' codec can't decode byte 0x89 in position 0: invalid start byte For completeness, see bug #126698 comment 2 for more details. 967174 1 ap 2014-01-12 23:46:03 -0800 Also bug 125689 comment 28. 967181 2 ap 2014-01-13 00:05:02 -0800 This regressed in <http://trac.webkit.org/changeset/160085>. 967188 3 221013 llango.u-szeged 2014-01-13 00:32:45 -0800 Created attachment 221013 Patch 967334 4 221013 rniwa 2014-01-13 08:33:11 -0800 Comment on attachment 221013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221013&action=review > Tools/Scripts/webkitpy/common/system/filesystem.py:203 > + def open_file_for_read(self, path): > + return codecs.open(path, 'r', 'utf8', 'replace') > + We shouldn't be adding this one off function with such an ambitious name here. r-. I could see open_text_file_for_reading having an optional argument to do this instead. 967382 5 ap 2014-01-13 10:07:43 -0800 Can a regression test be added for this fix? 967762 6 221142 llango.u-szeged 2014-01-14 04:56:23 -0800 Created attachment 221142 Patch 967763 7 llango.u-szeged 2014-01-14 04:59:31 -0800 (In reply to comment #4) > We shouldn't be adding this one off function with such an ambitious name here. You are right, i think it looks better now. (In reply to comment #5) > Can a regression test be added for this fix? Yes, good idea. I added a new test case for that. 967921 8 221142 ap 2014-01-14 10:39:57 -0800 Comment on attachment 221142 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221142&action=review Seems fine to land to stop bot failures as an emergency fix. Thanks for looking into this! Longer term, I think that the approach could be further improved. We could skip known non-text files, and we could also handle decoding failures more gracefully. In fact, we should probably report an explicit error when there is malformed utf-8 in actual text files. I do not know what our compilers do in this case, especially when it's in comments. > Tools/ChangeLog:8 > + Resolve regression and remove a FIXME comment that is already fixed. The final patch doesn't remove any FIXMEs. > Tools/Scripts/webkitpy/common/system/filesystem.py:201 > + def open_text_file_for_reading(self, path, errors='strict'): It's not good that we are calling a function named "open_text_file_for_reading" on all files, not only text ones. This should be fixed. 967932 9 221142 commit-queue 2014-01-14 11:09:45 -0800 Comment on attachment 221142 Patch Clearing flags on attachment: 221142 Committed r161986: <http://trac.webkit.org/changeset/161986> 967933 10 commit-queue 2014-01-14 11:09:49 -0800 All reviewed patches have been landed. Closing bug. 968242 11 llango.u-szeged 2014-01-15 02:26:21 -0800 (In reply to comment #8) > > Tools/ChangeLog:8 > > + Resolve regression and remove a FIXME comment that is already fixed. > > The final patch doesn't remove any FIXMEs. > :( I missed it from the second version of the patch. That FIXME was fixed in r160085. We Should remove that comment. Sorry for that. 221013 2014-01-13 00:32:45 -0800 2014-01-14 04:56:16 -0800 Patch bug-126702-20140113003245.patch text/plain 2777 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjI0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmExNDMzODA2Yjg2ZDdkZjk1Y2FiZDNlYWNmNTI2MWY1 MTExMTI0Ni4uOWZlZjUwYTYxYWFlYTBhOTA0OTE5YWI3ZjZhYjFiZmIyODY1MTQyMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE0LTAxLTEzICBMw6FzemzDsyBMYW5nw7MgIDxsbGFuZ28udS1zemVnZWRAcGFydG5l ci5zYW1zdW5nLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTYwMDg1KTogY2hlY2std2Vi a2l0LXN0eWxlOiB1dGY4JyBjb2RlYyBjYW4ndCBkZWNvZGUgYnl0ZSAweDg5IGluIHBvc2l0aW9u IDA6IGludmFsaWQgc3RhcnQgYnl0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyNjcwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlc29sdmUgcmVncmVzc2lvbiBhbmQgcmVtb3ZlIGEgRklYTUUgY29t bWVudCB0aGF0IGlzIGFscmVhZHkgZml4ZWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weToKKyAgICAgICAgKEZpbGVTeXN0ZW0ub3Blbl9m aWxlX2Zvcl9yZWFkKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2ZpbGVyZWFk ZXIucHk6CisgICAgICAgIChUZXh0RmlsZVJlYWRlci5fX2luaXRfXyk6CisgICAgICAgIChUZXh0 RmlsZVJlYWRlci5fcmVhZF9saW5lcyk6CisKIDIwMTQtMDEtMDkgIERhbiBCZXJuc3RlaW4gIDxt aXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFByb21vdGUgV0tCYWNrRm9yd2FyZExp c3R7LEl0ZW19LmggdG8gcHVibGljCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5CmluZGV4IDZkN2M4YTAzNzI5MTdhMjcyZDVjZTg5NDMx YmFlNDQ2NDRkNjcxNGMuLmE4NDNjYzA1MDE5ZWNjMDAxNTBjYjIwNjBmZDQ5MWM2YWYxMjYzZWQg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lz dGVtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lz dGVtLnB5CkBAIC0xOTgsNiArMTk4LDkgQEAgY2xhc3MgRmlsZVN5c3RlbShvYmplY3QpOgogICAg ICAgICB3aXRoIGZpbGUocGF0aCwgJ3diJykgYXMgZjoKICAgICAgICAgICAgIGYud3JpdGUoY29u dGVudHMpCiAKKyAgICBkZWYgb3Blbl9maWxlX2Zvcl9yZWFkKHNlbGYsIHBhdGgpOgorICAgICAg ICByZXR1cm4gY29kZWNzLm9wZW4ocGF0aCwgJ3InLCAndXRmOCcsICdyZXBsYWNlJykKKwogICAg IGRlZiBvcGVuX3RleHRfZmlsZV9mb3JfcmVhZGluZyhzZWxmLCBwYXRoKToKICAgICAgICAgIyBO b3RlOiBUaGVyZSBhcHBlYXJzIHRvIGJlIGFuIGlzc3VlIHdpdGggdGhlIHJldHVybmVkIGZpbGUg b2JqZWN0cwogICAgICAgICAjIG5vdCBiZWluZyBzZWVrYWJsZS4gU2VlIGh0dHA6Ly9zdGFja292 ZXJmbG93LmNvbS9xdWVzdGlvbnMvMTUxMDE4OC9jYW4tc2Vlay1hbmQtdGVsbC13b3JrLXdpdGgt dXRmLTgtZW5jb2RlZC1kb2N1bWVudHMtaW4tcHl0aG9uIC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsZXJlYWRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvZmlsZXJlYWRlci5weQppbmRleCBiN2YwNjVlZTAyZjg5YTM0ZDk1MzU4MTNlM2Y5 NjQxNTJlZGUzNTg4Li5mNWY5ZDBkMWJiMjkzYjUyNTk4ZTU5NDFiZWY5OWIwZmIzMDM3NzUxIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2ZpbGVyZWFkZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxlcmVhZGVyLnB5CkBAIC01OSw3ICs1 OSw3IEBAIGNsYXNzIFRleHRGaWxlUmVhZGVyKG9iamVjdCk6CiAgICAgICAgICAgcHJvY2Vzc29y OiBBIFByb2Nlc3NvckJhc2UgaW5zdGFuY2UuCiAKICAgICAgICAgIiIiCi0gICAgICAgICMgRklY TUU6IEFsdGhvdWdoIFRleHRGaWxlUmVhZGVyIHJlcXVpcmVzIGEgRmlsZVN5c3RlbSBpdCBjaXJj dW12ZW50cyBpdCBpbiB0d28gcGxhY2VzIQorCiAgICAgICAgIHNlbGYuZmlsZXN5c3RlbSA9IGZp bGVzeXN0ZW0KICAgICAgICAgc2VsZi5fcHJvY2Vzc29yID0gcHJvY2Vzc29yCiAgICAgICAgIHNl bGYuZmlsZV9jb3VudCA9IDAKQEAgLTgwLDcgKzgwLDcgQEAgY2xhc3MgVGV4dEZpbGVSZWFkZXIo b2JqZWN0KToKICAgICAgICAgICAgICMgKGNvZGVjcyBkb2VzIG5vdCBzdXBwb3J0IGl0IGFueXdh eSksIHNvIHRoZSByZXN1bHRpbmcKICAgICAgICAgICAgICMgbGluZXMgY29udGFpbiB0cmFpbGlu ZyAiXHIiIGNoYXJhY3RlcnMgaWYgd2UgYXJlIHJlYWRpbmcKICAgICAgICAgICAgICMgYSBmaWxl IHdpdGggQ1JMRiBlbmRpbmdzLgotICAgICAgICAgICAgZmlsZSA9IHNlbGYuZmlsZXN5c3RlbS5v cGVuX3RleHRfZmlsZV9mb3JfcmVhZGluZyhmaWxlX3BhdGgpCisgICAgICAgICAgICBmaWxlID0g c2VsZi5maWxlc3lzdGVtLm9wZW5fZmlsZV9mb3JfcmVhZChmaWxlX3BhdGgpCiAKICAgICAgICAg dHJ5OgogICAgICAgICAgICAgY29udGVudHMgPSBmaWxlLnJlYWQoKQo= 221142 2014-01-14 04:56:23 -0800 2014-01-14 11:09:45 -0800 Patch bug-126702-20140114045622.patch text/plain 4946 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxOTUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWI5ZDMzMmMwOTlmNjM5MzY3NjcxYzA0MTExYzdhM2Jh Mzg3YWJjZS4uMWE5MTYzZjQ4YzAzNzlhMTJjNzQzMjQ2YTgxMTBlZjQ0NjRlNGNjMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE0LTAxLTE0ICBMw6FzemzDsyBMYW5nw7MgIDxsbGFuZ28udS1zemVnZWRAcGFydG5l ci5zYW1zdW5nLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTYwMDg1KTogY2hlY2std2Vi a2l0LXN0eWxlOiB1dGY4JyBjb2RlYyBjYW4ndCBkZWNvZGUgYnl0ZSAweDg5IGluIHBvc2l0aW9u IDA6IGludmFsaWQgc3RhcnQgYnl0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyNjcwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlc29sdmUgcmVncmVzc2lvbiBhbmQgcmVtb3ZlIGEgRklYTUUgY29t bWVudCB0aGF0IGlzIGFscmVhZHkgZml4ZWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weToKKyAgICAgICAgKEZpbGVTeXN0ZW0ub3Blbl90 ZXh0X2ZpbGVfZm9yX3JlYWRpbmcpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS9maWxlc3lzdGVtX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUmVhbEZpbGVTeXN0ZW1U ZXN0LnRlc3RfcmVhZF9hbmRfd3JpdGVfZmlsZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9maWxlcmVhZGVyLnB5OgorICAgICAgICAoVGV4dEZpbGVSZWFkZXIuX3JlYWRfbGlu ZXMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsZXJlYWRlcl91bml0dGVz dC5weToKKyAgICAgICAgKFRleHRGaWxlUmVhZGVyVGVzdC50ZXN0X2NvdW50X2RlbGV0ZV9vbmx5 X2ZpbGUpOgorICAgICAgICAoVGV4dEZpbGVSZWFkZXJUZXN0KToKKyAgICAgICAgKFRleHRGaWxl UmVhZGVyVGVzdC50ZXN0X3Byb2Nlc3NfbWFsZm9ybWVkX2ZpbGUpOgorCiAyMDE0LTAxLTEzICBM dWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUg dGhlIExMSU5UIENMb29wIEJvdCBidWlsZCBpbmZyYXN0cnVjdHVyZQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weQppbmRleCA2ZDdjOGEw MzcyOTE3YTI3MmQ1Y2U4OTQzMWJhZTQ0NjQ0ZDY3MTRjLi5iYWU2ZjY0ZGU4NzBlZjE3YmIxNjAx NjgwM2QxZmJjY2FjMGUzMDdmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weQpAQCAtMTk4LDEwICsxOTgsMTAgQEAgY2xhc3MgRmls ZVN5c3RlbShvYmplY3QpOgogICAgICAgICB3aXRoIGZpbGUocGF0aCwgJ3diJykgYXMgZjoKICAg ICAgICAgICAgIGYud3JpdGUoY29udGVudHMpCiAKLSAgICBkZWYgb3Blbl90ZXh0X2ZpbGVfZm9y X3JlYWRpbmcoc2VsZiwgcGF0aCk6CisgICAgZGVmIG9wZW5fdGV4dF9maWxlX2Zvcl9yZWFkaW5n KHNlbGYsIHBhdGgsIGVycm9ycz0nc3RyaWN0Jyk6CiAgICAgICAgICMgTm90ZTogVGhlcmUgYXBw ZWFycyB0byBiZSBhbiBpc3N1ZSB3aXRoIHRoZSByZXR1cm5lZCBmaWxlIG9iamVjdHMKICAgICAg ICAgIyBub3QgYmVpbmcgc2Vla2FibGUuIFNlZSBodHRwOi8vc3RhY2tvdmVyZmxvdy5jb20vcXVl c3Rpb25zLzE1MTAxODgvY2FuLXNlZWstYW5kLXRlbGwtd29yay13aXRoLXV0Zi04LWVuY29kZWQt ZG9jdW1lbnRzLWluLXB5dGhvbiAuCi0gICAgICAgIHJldHVybiBjb2RlY3Mub3BlbihwYXRoLCAn cicsICd1dGY4JykKKyAgICAgICAgcmV0dXJuIGNvZGVjcy5vcGVuKHBhdGgsICdyJywgJ3V0Zjgn LCBlcnJvcnMpCiAKICAgICBkZWYgb3Blbl90ZXh0X2ZpbGVfZm9yX3dyaXRpbmcoc2VsZiwgcGF0 aCk6CiAgICAgICAgIHJldHVybiBjb2RlY3Mub3BlbihwYXRoLCAndycsICd1dGY4JykKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0 ZW1fdW5pdHRlc3QucHkKaW5kZXggY2Q0YWQ2ZTRhM2MzN2RmMjExMGI2YmNhZmI0YjY0MDU2YWQ2 OTEzMy4uMDM4NDcyYmIxNmVlMjE4ZjUwNGY2NzA4ZGZmNzViNWQ4ZTkyOGRjYyAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fdW5pdHRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0 ZW1fdW5pdHRlc3QucHkKQEAgLTIyNyw2ICsyMjcsOCBAQCBjbGFzcyBSZWFsRmlsZVN5c3RlbVRl c3QodW5pdHRlc3QuVGVzdENhc2UsIEdlbmVyaWNGaWxlU3lzdGVtVGVzdHMpOgogICAgICAgICAg ICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwgZnMucmVhZF90ZXh0X2ZpbGUsIGJpbmFy eV9wYXRoKQogICAgICAgICAgICAgdGV4dF9jb250ZW50cyA9IGZzLnJlYWRfYmluYXJ5X2ZpbGUo YmluYXJ5X3BhdGgpLmRlY29kZSgndXRmOCcsICdpZ25vcmUnKQogICAgICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbHModGV4dF9jb250ZW50cywgbWFsZm9ybWVkX2lnbm9yZWRfdGV4dF9oZXgpCisg ICAgICAgICAgICBmcy5vcGVuX3RleHRfZmlsZV9mb3JfcmVhZGluZyhiaW5hcnlfcGF0aCwgJ3Jl cGxhY2UnKS5yZWFkbGluZSgpCisKICAgICAgICAgZmluYWxseToKICAgICAgICAgICAgIGlmIHRl eHRfcGF0aCBhbmQgZnMuaXNmaWxlKHRleHRfcGF0aCk6CiAgICAgICAgICAgICAgICAgb3MucmVt b3ZlKHRleHRfcGF0aCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv ZmlsZXJlYWRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsZXJlYWRlci5w eQppbmRleCBiN2YwNjVlZTAyZjg5YTM0ZDk1MzU4MTNlM2Y5NjQxNTJlZGUzNTg4Li5iNmM4ZDNj YzNjYWM3YjEyYzExYTIxNGRhZmNlMzllYjJmNjUxNGRhIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2ZpbGVyZWFkZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9maWxlcmVhZGVyLnB5CkBAIC04MCw3ICs4MCw3IEBAIGNsYXNzIFRleHRGaWxl UmVhZGVyKG9iamVjdCk6CiAgICAgICAgICAgICAjIChjb2RlY3MgZG9lcyBub3Qgc3VwcG9ydCBp dCBhbnl3YXkpLCBzbyB0aGUgcmVzdWx0aW5nCiAgICAgICAgICAgICAjIGxpbmVzIGNvbnRhaW4g dHJhaWxpbmcgIlxyIiBjaGFyYWN0ZXJzIGlmIHdlIGFyZSByZWFkaW5nCiAgICAgICAgICAgICAj IGEgZmlsZSB3aXRoIENSTEYgZW5kaW5ncy4KLSAgICAgICAgICAgIGZpbGUgPSBzZWxmLmZpbGVz eXN0ZW0ub3Blbl90ZXh0X2ZpbGVfZm9yX3JlYWRpbmcoZmlsZV9wYXRoKQorICAgICAgICAgICAg ZmlsZSA9IHNlbGYuZmlsZXN5c3RlbS5vcGVuX3RleHRfZmlsZV9mb3JfcmVhZGluZyhmaWxlX3Bh dGgsICdyZXBsYWNlJykKIAogICAgICAgICB0cnk6CiAgICAgICAgICAgICBjb250ZW50cyA9IGZp bGUucmVhZCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2ZpbGVy ZWFkZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2ZpbGVyZWFk ZXJfdW5pdHRlc3QucHkKaW5kZXggNGMzMGFhODg5ZWZlN2Q5YzU1YTllYjA3NGVkZDBiODZhYzU4 NzQzOS4uMGZlMmRhN2I3YWJmYzVjM2UzZDYxZWJkNThiY2UyN2I4NTU1ZjdhZiAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxlcmVhZGVyX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsZXJlYWRlcl91bml0dGVzdC5weQpA QCAtMjAsNiArMjAsNyBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog CitpbXBvcnQgdGVtcGZpbGUKIGltcG9ydCB1bml0dGVzdDIgYXMgdW5pdHRlc3QKIAogZnJvbSB3 ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KQEAgLTE1 MywzICsxNTQsOCBAQCBjbGFzcyBUZXh0RmlsZVJlYWRlclRlc3QoTG9nZ2luZ1Rlc3RDYXNlKToK ICAgICAgICAgc2VsZi5fZmlsZV9yZWFkZXIuY291bnRfZGVsZXRlX29ubHlfZmlsZSgpCiAgICAg ICAgIGRlbGV0ZV9vbmx5X2ZpbGVfY291bnQgPSBzZWxmLl9maWxlX3JlYWRlci5kZWxldGVfb25s eV9maWxlX2NvdW50CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZGVsZXRlX29ubHlfZmlsZV9j b3VudCwgMSkKKworICAgIGRlZiB0ZXN0X3Byb2Nlc3NfbWFsZm9ybWVkX2ZpbGUoc2VsZik6Cisg ICAgICAgIGZpbGVfcGF0aCA9IHRlbXBmaWxlLm1rdGVtcChwcmVmaXg9J2ZpbGVyZWFkZXJfdW5p dHRlc3RfJykKKyAgICAgICAgc2VsZi5maWxlc3lzdGVtLndyaXRlX2JpbmFyeV9maWxlKGZpbGVf cGF0aCwgJ1x4NERceDY5XHg2M1x4NzJceDZGXHg3M1x4NkZceDY2XHg3NFx4QUUnKQorICAgICAg ICBzZWxmLl9maWxlX3JlYWRlci5wcm9jZXNzX2ZpbGUoZmlsZV9wYXRoKQo=