181254 2018-01-03 12:25:27 -0800 run-webkit-tests fails when there is a curly brace in Xcode build output 2018-01-19 11:16:04 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap commit-queue dbates dean_johnson ews-watchlist glenn jbedard lforschler ryanhaddad webkit-bug-importer oldest_to_newest 1385537 0 ap 2018-01-03 12:25:27 -0800 I'm currently in a state where Xcode outputs something with a curly quote when building, and that breaks run-webkit-tests (which calls build-dumprendertree). UnicodeEncodeError raised: 'ascii' codec can't encode character u'\u201c' in position 1514: ordinal not in range(128) Traceback (most recent call last): File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 85, in main run_details = run(port, options, args, stderr) File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 445, in run run_details = manager.run(args) File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 246, in run if not self._set_up_run(tests_to_run): File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 164, in _set_up_run if not self._port.check_build(self.needs_servers(test_names)): File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/port/base.py", line 230, in check_build if not self._root_was_set and self.get_option('build') and not self._build_driver(): File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/port/base.py", line 1438, in _build_driver self._run_script("build-dumprendertree", args=self._build_driver_flags(), env=env) File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/port/base.py", line 1428, in _run_script _log.debug('Output of %s:\n%s' % (run_script_command, output)) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/logging/__init__.py", line 1153, in debug self._log(DEBUG, msg, args, **kwargs) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/logging/__init__.py", line 1284, in _log self.handle(record) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/logging/__init__.py", line 1294, in handle self.callHandlers(record) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/logging/__init__.py", line 1334, in callHandlers hdlr.handle(record) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/logging/__init__.py", line 757, in handle self.emit(record) File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py", line 135, in emit self._meter.writeln(record.getMessage(), record.created, record.process) File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py", line 111, in writeln self.write(self._ensure_newline(txt), now, pid) File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py", line 108, in write self._stream.write(msg) UnicodeEncodeError: 'ascii' codec can't encode character u'\u201c' in position 1514: ordinal not in range(128) 1385538 1 330409 ap 2018-01-03 12:27:12 -0800 Created attachment 330409 proposed fix I don't really know what I'm doing here, just patched it enough to work on my machine. Thoughts? 1388294 2 330409 dbates 2018-01-11 10:33:59 -0800 Comment on attachment 330409 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=330409&action=review > Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py:108 > + self._stream.write(msg.encode('utf-8')) This makes the assumption that the output shell is using UTF-8 encoding. Is this the default shell encoding on macOS, Linux, Windows? Alternatively we could appropriately encode the output we get when running build-dumprendertree. 1388296 3 ap 2018-01-11 10:39:38 -0800 > Is this the default shell encoding on macOS, Linux, Windows? I don't know how to answer that, or what the code was doing by default. I only know that this fixes my local build. 1388511 4 330409 ap 2018-01-11 15:50:48 -0800 Comment on attachment 330409 proposed fix Please feel encouraged to roll back if this breaks anything. 1388537 5 330409 commit-queue 2018-01-11 16:15:18 -0800 Comment on attachment 330409 proposed fix Clearing flags on attachment: 330409 Committed r226816: <https://trac.webkit.org/changeset/226816> 1388538 6 commit-queue 2018-01-11 16:15:19 -0800 All reviewed patches have been landed. Closing bug. 1388547 7 webkit-bug-importer 2018-01-11 16:20:38 -0800 <rdar://problem/36453374> 1388607 8 ryanhaddad 2018-01-11 18:17:29 -0800 This broke LayoutTests on the bots: https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK2%20(Tests)/builds/2213 1388610 9 ryanhaddad 2018-01-11 18:19:30 -0800 Reverted r226816 for reason: This change broke LayoutTests on the bots. Committed r226837: <https://trac.webkit.org/changeset/226837> 1388806 10 jbedard 2018-01-12 08:33:03 -0800 I'm not sure that this should be fixed in webkitpy. I've seen a similar issue where LEFT and RIGHT quotations coming from xcodebuild have the same problem. Perhaps we should place a filter around calls to xcodebuild in perl. 1388816 11 331207 jbedard 2018-01-12 09:35:46 -0800 Created attachment 331207 Patch 1388818 12 jbedard 2018-01-12 09:37:37 -0800 (In reply to Jonathan Bedard from comment #11) > Created attachment 331207 [details] > Patch Talking with Alexey, it seems that we are not willing to filter in build-webkit. I think we need a larger discussion of which string encoding we would like to standardize in webkitpy, but for the time being, we need to prevent exceptions. 1388887 13 331207 dbates 2018-01-12 11:47:55 -0800 Comment on attachment 331207 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=331207&action=review > Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py:109 > + self._stream.write(msg.encode(self._encoding, 'replace')) Did you confirm that this actually fixes the issue? To be more specific, were you able to reproduce the original bug? And did you verify that this actually fixes the bug? From briefly looking at the backtrace in <https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK2%20(Tests)/builds/2213/steps/layout-test/logs/stdio> I get the impression that the bug was that we were UTF-8 encoding twice (e.g. u"\u2013".encode('utf-8').encode('utf-8')). Assuming this is the bug then I would expect the fix to be that we UTF-8 encode |output| before perform string interpolation and passing the result to _log.debug() as seen in the original backtrace: File "/Users/ap/Safari/OpenSource/Tools/Scripts/webkitpy/port/base.py", line 1428, in _run_script _log.debug('Output of %s:\n%s' % (run_script_command, output)) 1388957 14 331207 jbedard 2018-01-12 14:08:23 -0800 Comment on attachment 331207 Patch I had not yet verified that this fixed the new bug. I managed to reproduce the new bug locally, the proposed patch does not address it. 1388966 15 331238 jbedard 2018-01-12 14:50:44 -0800 Created attachment 331238 Patch 1388968 16 jbedard 2018-01-12 14:53:42 -0800 (In reply to Jonathan Bedard from comment #15) > Created attachment 331238 [details] > Patch This will address Alexey's problem without the side-effects. 1388977 17 331238 dbates 2018-01-12 15:27:24 -0800 Comment on attachment 331238 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=331238&action=review > Tools/Scripts/webkitpy/port/base.py:1429 > + if decode_output: > + output = output.decode('utf-8') This does not make sense because |output| represents the decoded output when decode_output is True. Please start reading from the last sentence of the first paragraph in comment #13 again. 1389571 18 331390 jbedard 2018-01-16 09:01:36 -0800 Created attachment 331390 Patch 1389584 19 331390 jbedard 2018-01-16 09:35:36 -0800 Comment on attachment 331390 Patch I looked closer at how I was attempting to reproduce the failure that Alexey saw, and realized that I have yet to actually reproduce it. Dan's comments were accurate, and this change essentially applies Alexey's previous patch to only decoded script runs. 1390138 20 331390 dbates 2018-01-17 11:40:46 -0800 Comment on attachment 331390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=331390&action=review > Tools/Scripts/webkitpy/port/base.py:1430 > + if decode_output: > + output = output.encode('utf-8') > _log.debug('Output of %s:\n%s' % (run_script_command, output)) We should only encode |output| for the purpose of calling _log.debug(). That is, we should not return the encoded data because the caller expects a string of characters (not a string of bytes). 1390143 21 331528 jbedard 2018-01-17 11:53:08 -0800 Created attachment 331528 Patch 1390146 22 jbedard 2018-01-17 11:54:44 -0800 (In reply to Daniel Bates from comment #20) > Comment on attachment 331390 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=331390&action=review > > > Tools/Scripts/webkitpy/port/base.py:1430 > > + if decode_output: > > + output = output.encode('utf-8') > > _log.debug('Output of %s:\n%s' % (run_script_command, output)) > > We should only encode |output| for the purpose of calling _log.debug(). That > is, we should not return the encoded data because the caller expects a > string of characters (not a string of bytes). The output is unused by the callers, but this is a fair point. Especially since this bug only occurs with an explicit request to decode the output. 1391017 23 331528 dbates 2018-01-19 10:34:06 -0800 Comment on attachment 331528 Patch r=me 1391050 24 331528 commit-queue 2018-01-19 11:16:03 -0800 Comment on attachment 331528 Patch Clearing flags on attachment: 331528 Committed r227222: <https://trac.webkit.org/changeset/227222> 1391051 25 commit-queue 2018-01-19 11:16:04 -0800 All reviewed patches have been landed. Closing bug. 330409 2018-01-03 12:27:12 -0800 2018-01-12 09:35:45 -0800 proposed fix CurlyBrace.txt text/plain 1249 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNjM3MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE4LTAxLTAzICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgZmFpbHMgd2hlbiB0aGVyZSBpcyBhIGN1cmx5 IGJyYWNlIGluIFhjb2RlIGJ1aWxkIG91dHB1dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMjU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3 cy9tZXRlcmVkX3N0cmVhbS5weToKKyAgICAgICAgKE1ldGVyZWRTdHJlYW0ud3JpdGUpOgorCiAy MDE4LTAxLTAzICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXSBBZGQgd2ViIHByb2Nlc3MgQVBJIHRvIGRldGVjdCB3aGVuIGZvcm0gaXMg c3VibWl0dGVkIHZpYSBKYXZhU2NyaXB0CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy92aWV3cy9tZXRlcmVkX3N0cmVhbS5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9tZXRlcmVkX3N0cmVhbS5weQkocmV2 aXNpb24gMjI2MzYyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmll d3MvbWV0ZXJlZF9zdHJlYW0ucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw3ICsxMDUsNyBAQCBj bGFzcyBNZXRlcmVkU3RyZWFtKG9iamVjdCk6CiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBt c2cgPSBzZWxmLl9lbnN1cmVfbmV3bGluZSh0eHQpCiAKLSAgICAgICAgc2VsZi5fc3RyZWFtLndy aXRlKG1zZykKKyAgICAgICAgc2VsZi5fc3RyZWFtLndyaXRlKG1zZy5lbmNvZGUoJ3V0Zi04Jykp CiAKICAgICBkZWYgd3JpdGVsbihzZWxmLCB0eHQsIG5vdz1Ob25lLCBwaWQ9Tm9uZSk6CiAgICAg ICAgIHNlbGYud3JpdGUoc2VsZi5fZW5zdXJlX25ld2xpbmUodHh0KSwgbm93LCBwaWQpCg== 331207 2018-01-12 09:35:46 -0800 2018-01-12 14:50:43 -0800 Patch bug-181254-20180112093546.patch text/plain 2280 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNjg5NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE4LTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIGZhaWxzIHdoZW4gdGhlcmUgaXMgYSBjdXJs eSBicmFjZSBpbiBYY29kZSBidWlsZCBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTI1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzY0 NTMzNzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9tZXRlcmVkX3N0cmVhbS5weToK KyAgICAgICAgKE1ldGVyZWRTdHJlYW0uX19pbml0X18pOiBEZWZpbmUgZW5jb2RpbmcgdG8gYmUg dXNlZC4KKyAgICAgICAgKE1ldGVyZWRTdHJlYW0ud3JpdGUpOiBFbmNvZGUgd2l0aCB0aGUgc3Bl Y2lmaWVkIGVuY29kaW5nLCByZXBsYWNlIGNoYXJhY3RlcnMgd2hpY2ggY2Fubm90IGJlIGVuY29k ZWQuCisKIDIwMTgtMDEtMTEgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVuYW1lIEVOQUJMRV9BU1lOQ19JVEVSQVRJT04gdG8gRU5BQkxFX0pTX0FT WU5DX0lURVJBVElPTgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv dmlld3MvbWV0ZXJlZF9zdHJlYW0ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvdmlld3MvbWV0ZXJlZF9zdHJlYW0ucHkJKHJldmlzaW9uIDIyNjg5 MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL21ldGVyZWRf c3RyZWFtLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01MSw3ICs1MSw3IEBAIGNsYXNzIE1ldGVyZWRT dHJlYW0ob2JqZWN0KToKICAgICBkZWYgX2Vuc3VyZV9uZXdsaW5lKHR4dCk6CiAgICAgICAgIHJl dHVybiB0eHQgaWYgdHh0LmVuZHN3aXRoKCdcbicpIGVsc2UgdHh0ICsgJ1xuJwogCi0gICAgZGVm IF9faW5pdF9fKHNlbGYsIHN0cmVhbT1Ob25lLCB2ZXJib3NlPUZhbHNlLCBsb2dnZXI9Tm9uZSwg dGltZV9mbj1Ob25lLCBwaWQ9Tm9uZSwgbnVtYmVyX29mX2NvbHVtbnM9Tm9uZSk6CisgICAgZGVm IF9faW5pdF9fKHNlbGYsIHN0cmVhbT1Ob25lLCB2ZXJib3NlPUZhbHNlLCBsb2dnZXI9Tm9uZSwg dGltZV9mbj1Ob25lLCBwaWQ9Tm9uZSwgbnVtYmVyX29mX2NvbHVtbnM9Tm9uZSwgZW5jb2Rpbmc9 J2FzY2lpJyk6CiAgICAgICAgIHNlbGYuX3N0cmVhbSA9IHN0cmVhbSBvciBzeXMuc3RkZXJyCiAg ICAgICAgIHNlbGYuX3ZlcmJvc2UgPSB2ZXJib3NlCiAgICAgICAgIHNlbGYuX3RpbWVfZm4gPSB0 aW1lX2ZuIG9yIHRpbWUudGltZQpAQCAtNjIsNiArNjIsNyBAQCBjbGFzcyBNZXRlcmVkU3RyZWFt KG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2xhc3Rfd3JpdGVfdGltZSA9IDAuMAogICAgICAgICBz ZWxmLl90aHJvdHRsZV9kZWxheV9pbl9zZWNzID0gMC4wNjYgaWYgc2VsZi5fZXJhc2luZyBlbHNl IDEwLjAKICAgICAgICAgc2VsZi5fbnVtYmVyX29mX2NvbHVtbnMgPSBzeXMubWF4aW50CisgICAg ICAgIHNlbGYuX2VuY29kaW5nID0gZW5jb2RpbmcKICAgICAgICAgaWYgc2VsZi5faXNhdHR5IGFu ZCBudW1iZXJfb2ZfY29sdW1uczoKICAgICAgICAgICAgIHNlbGYuX251bWJlcl9vZl9jb2x1bW5z ID0gbnVtYmVyX29mX2NvbHVtbnMKIApAQCAtMTA1LDcgKzEwNiw3IEBAIGNsYXNzIE1ldGVyZWRT dHJlYW0ob2JqZWN0KToKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIG1zZyA9IHNlbGYuX2Vu c3VyZV9uZXdsaW5lKHR4dCkKIAotICAgICAgICBzZWxmLl9zdHJlYW0ud3JpdGUobXNnKQorICAg ICAgICBzZWxmLl9zdHJlYW0ud3JpdGUobXNnLmVuY29kZShzZWxmLl9lbmNvZGluZywgJ3JlcGxh Y2UnKSkKIAogICAgIGRlZiB3cml0ZWxuKHNlbGYsIHR4dCwgbm93PU5vbmUsIHBpZD1Ob25lKToK ICAgICAgICAgc2VsZi53cml0ZShzZWxmLl9lbnN1cmVfbmV3bGluZSh0eHQpLCBub3csIHBpZCkK 331238 2018-01-12 14:50:44 -0800 2018-01-16 09:01:35 -0800 Patch bug-181254-20180112145044.patch text/plain 1331 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNjkxNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE4LTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIGZhaWxzIHdoZW4gdGhlcmUgaXMgYSBjdXJs eSBicmFjZSBpbiBYY29kZSBidWlsZCBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTI1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzY0 NTMzNzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQuX3J1bl9zY3Jp cHQpOiBEZWNvZGUgc2NyaXB0IG91dHB1dCBiZWZvcmUgbG9nZ2luZyBpdC4KKwogMjAxOC0wMS0x MiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IFJFR1JFU1NJT04gKHIyMjY4MTgpOiBBUEkgdGVzdCBXZWJLaXRMZWdhY3kuTG9hZEludmFsaWRV UkxSZXF1ZXN0IGlzIGZhaWxpbmcKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9i YXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5 CShyZXZpc2lvbiAyMjY4OTEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5w eQkod29ya2luZyBjb3B5KQpAQCAtMTQyNSw2ICsxNDI1LDggQEAgY2xhc3MgUG9ydChvYmplY3Qp OgogICAgICAgICBpZiBhcmdzOgogICAgICAgICAgICAgcnVuX3NjcmlwdF9jb21tYW5kLmV4dGVu ZChhcmdzKQogICAgICAgICBvdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQocnVu X3NjcmlwdF9jb21tYW5kLCBjd2Q9c2VsZi53ZWJraXRfYmFzZSgpLCBkZWNvZGVfb3V0cHV0PWRl Y29kZV9vdXRwdXQsIGVudj1lbnYpCisgICAgICAgIGlmIGRlY29kZV9vdXRwdXQ6CisgICAgICAg ICAgICBvdXRwdXQgPSBvdXRwdXQuZGVjb2RlKCd1dGYtOCcpCiAgICAgICAgIF9sb2cuZGVidWco J091dHB1dCBvZiAlczpcbiVzJyAlIChydW5fc2NyaXB0X2NvbW1hbmQsIG91dHB1dCkpCiAgICAg ICAgIHJldHVybiBvdXRwdXQKIAo= 331390 2018-01-16 09:01:36 -0800 2018-01-17 11:53:07 -0800 Patch bug-181254-20180116090135.patch text/plain 1321 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNjk3NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE4LTAxLTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIGZhaWxzIHdoZW4gdGhlcmUgaXMgYSBjdXJs eSBicmFjZSBpbiBYY29kZSBidWlsZCBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTI1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzY0 NTMzNzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQuX3J1bl9zY3Jp cHQpOiBFbmNvZGUgc2NyaXB0IG91dHB1dCBiZWZvcmUgbG9nZ2luZyBpdC4KKwogMjAxOC0wMS0x NiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZC4gRml4IEdUSyB1bml0IHRlc3RzIGV4ZWN1dGlvbiBpbiB0aGUgYm90cyBhZnRl ciByMjI2OTY3LgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9u IDIyNjkyNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0xNDI1LDYgKzE0MjUsOCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAg IGlmIGFyZ3M6CiAgICAgICAgICAgICBydW5fc2NyaXB0X2NvbW1hbmQuZXh0ZW5kKGFyZ3MpCiAg ICAgICAgIG91dHB1dCA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChydW5fc2NyaXB0X2Nv bW1hbmQsIGN3ZD1zZWxmLndlYmtpdF9iYXNlKCksIGRlY29kZV9vdXRwdXQ9ZGVjb2RlX291dHB1 dCwgZW52PWVudikKKyAgICAgICAgaWYgZGVjb2RlX291dHB1dDoKKyAgICAgICAgICAgIG91dHB1 dCA9IG91dHB1dC5lbmNvZGUoJ3V0Zi04JykKICAgICAgICAgX2xvZy5kZWJ1ZygnT3V0cHV0IG9m ICVzOlxuJXMnICUgKHJ1bl9zY3JpcHRfY29tbWFuZCwgb3V0cHV0KSkKICAgICAgICAgcmV0dXJu IG91dHB1dAogCg== 331528 2018-01-17 11:53:08 -0800 2018-01-19 11:16:03 -0800 Patch bug-181254-20180117115307.patch text/plain 1396 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNjk3NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE4LTAxLTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIGZhaWxzIHdoZW4gdGhlcmUgaXMgYSBjdXJs eSBicmFjZSBpbiBYY29kZSBidWlsZCBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTI1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzY0 NTMzNzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQuX3J1bl9zY3Jp cHQpOiBFbmNvZGUgc2NyaXB0IG91dHB1dCBiZWZvcmUgbG9nZ2luZyBpdC4KKwogMjAxOC0wMS0x NiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZC4gRml4IEdUSyB1bml0IHRlc3RzIGV4ZWN1dGlvbiBpbiB0aGUgYm90cyBhZnRl ciByMjI2OTY3LgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9u IDIyNjkyNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0xNDI1LDcgKzE0MjUsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAg IGlmIGFyZ3M6CiAgICAgICAgICAgICBydW5fc2NyaXB0X2NvbW1hbmQuZXh0ZW5kKGFyZ3MpCiAg ICAgICAgIG91dHB1dCA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChydW5fc2NyaXB0X2Nv bW1hbmQsIGN3ZD1zZWxmLndlYmtpdF9iYXNlKCksIGRlY29kZV9vdXRwdXQ9ZGVjb2RlX291dHB1 dCwgZW52PWVudikKLSAgICAgICAgX2xvZy5kZWJ1ZygnT3V0cHV0IG9mICVzOlxuJXMnICUgKHJ1 bl9zY3JpcHRfY29tbWFuZCwgb3V0cHV0KSkKKyAgICAgICAgX2xvZy5kZWJ1ZygnT3V0cHV0IG9m ICVzOlxuJXMnICUgKHJ1bl9zY3JpcHRfY29tbWFuZCwgb3V0cHV0LmVuY29kZSgndXRmLTgnKSBp ZiBkZWNvZGVfb3V0cHV0IGVsc2Ugb3V0cHV0KSkKICAgICAgICAgcmV0dXJuIG91dHB1dAogCiAg ICAgZGVmIF9idWlsZF9kcml2ZXIoc2VsZik6Cg==