45791 2010-09-14 16:23:44 -0700 NRWT fails with UnicodeDecodeError on editing/selection/mixed-editability-10.html 2010-09-15 10:47:48 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mihaip dpranke abarth commit-queue dpranke eric ojan tony webkit.review.bot oldest_to_newest 279246 0 mihaip 2010-09-14 16:23:44 -0700 Stack trace: File "./WebKitTools/Scripts/new-run-webkit-tests", line 38, in <module> sys.exit(run_webkit_tests.main()) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 1722, in main return run(port_obj, options, args) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 1425, in run num_unexpected_results = test_runner.run(result_summary) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 780, in run self._run_tests(self._test_files_list, result_summary)) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 651, in _run_tests result_summary) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 619, in _instantiate_dump_render_tree_threads thread.run_in_main_thread(self, result_summary) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py", line 344, in run_in_main_thread self._run(test_runner, result_summary) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py", line 392, in _run result = self._run_test(test_info) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py", line 510, in _run_test output, error) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py", line 125, in _process_output configuration) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py", line 104, in compare_output print_text_diffs=True) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py", line 204, in write_output_files diff = port.diff_text(expected, output, expected_filename, actual_filename) File "/Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py", line 159, in diff_text return ''.join(diff) UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 7: ordinal not in range(128) 279276 1 dpranke 2010-09-14 17:41:22 -0700 The problem seems to be that we're passing in unicode strings for the filenames and raw strings for the content to diff. That results in the unified output being a mixture of the two datatypes, which causes ''.join() to do encoding conversions using the default 'ascii' converter, which keels over. The easiest fix is probably to convert the filenames to raw strings. 279282 2 67626 mihaip 2010-09-14 17:47:48 -0700 Created attachment 67626 Patch 279284 3 67626 tony 2010-09-14 17:52:13 -0700 Comment on attachment 67626 Patch Should test_expectations.txt be updated as well or does the test still fail? 279287 4 mihaip 2010-09-14 17:55:29 -0700 Test still fails, NRWT was just barfing when outputting the diff after the test had run. 279290 5 ojan 2010-09-14 17:58:37 -0700 I would slightly prefer something like the following. I feel like it's more explicit. But this is fine too. if isinstance(value, unicode): value = value.encode('utf-8') 279292 6 dpranke 2010-09-14 18:05:59 -0700 I'm fine w/ the patch as is. I'm not sure that Ojan's mod is worth the extra verbosity. 279296 7 tony 2010-09-14 18:12:31 -0700 (In reply to comment #5) > I would slightly prefer something like the following. I feel like it's more explicit. But this is fine too. > > if isinstance(value, unicode): > value = value.encode('utf-8') |value| will always be a unicode string, won't it? Explicitly calling encode seems a bit better. 279297 8 dpranke 2010-09-14 18:16:46 -0700 (In reply to comment #7) > (In reply to comment #5) > > I would slightly prefer something like the following. I feel like it's more explicit. But this is fine too. > > > > if isinstance(value, unicode): > > value = value.encode('utf-8') > > |value| will always be a unicode string, won't it? Explicitly calling encode seems a bit better. I assumed Ojan's comment was pseudocode out of context. There isn't actually a 'value' variable anywhere in the code AFAIK. 279326 9 67626 eric 2010-09-14 19:05:46 -0700 Comment on attachment 67626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67626&action=prettypatch > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:160 > + expected_filename = str(expected_filename) > + actual_filename = str(actual_filename) This will take expected_filename and try to decode it as ascii. Is that what you intended? If expected_filename is already a str() object it has no effect, but if it's unicode() that's effectively calling filename.encode('ascii') which may not be what you want? (At least that's my understanding.) > WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py:175 > + port.diff_text('exp', 'act', 'exp.txt', 'act.txt') > + port.diff_text('exp', 'act', u'exp.txt', 'act.txt') > + > + port.diff_text('exp' + chr(255), 'act', 'exp.txt', 'act.txt') > + port.diff_text('exp' + chr(255), 'act', u'exp.txt', 'act.txt') Seems we need a test with unicode characters here. I don't think this is 100% right, but please correct me if I'm wrong. :) 279330 10 dpranke 2010-09-14 19:24:20 -0700 (In reply to comment #9) > (From update of attachment 67626 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67626&action=prettypatch > > > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:160 > > + expected_filename = str(expected_filename) > > + actual_filename = str(actual_filename) > This will take expected_filename and try to decode it as ascii. Is that what you intended? If expected_filename is already a str() object it has no effect, but if it's unicode() that's effectively calling filename.encode('ascii') which may not be what you want? (At least that's my understanding.) > > > WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py:175 > > + port.diff_text('exp', 'act', 'exp.txt', 'act.txt') > > + port.diff_text('exp', 'act', u'exp.txt', 'act.txt') > > + > > + port.diff_text('exp' + chr(255), 'act', 'exp.txt', 'act.txt') > > + port.diff_text('exp' + chr(255), 'act', u'exp.txt', 'act.txt') > Seems we need a test with unicode characters here. > > I don't think this is 100% right, but please correct me if I'm wrong. :) The second line gives us the test with unicode in it. Really, we only needed those two. The third and fourth test to make sure that we're *not* doing an ascii conversion, because those would choke on a non-ascii character (the original test contained non-ascii characters in the expected and actual strings). 279331 11 dpranke 2010-09-14 19:25:40 -0700 (In reply to comment #9) > (From update of attachment 67626 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67626&action=prettypatch > > > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:160 > > + expected_filename = str(expected_filename) > > + actual_filename = str(actual_filename) > This will take expected_filename and try to decode it as ascii. Is that what you intended? If expected_filename is already a str() object it has no effect, but if it's unicode() that's effectively calling filename.encode('ascii') which may not be what you want? (At least that's my understanding.) > Yup, that's what we wanted, except that we actually want "turn this into a raw string so that I can safely join it to other raw strings". We don't want to force every line to ascii, or we'd still run into the problem we have now (expected strings containing non-ascii characters). 279333 12 mihaip 2010-09-14 19:27:32 -0700 (In reply to comment #11) > (In reply to comment #9) > > (From update of attachment 67626 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=67626&action=prettypatch > > > > > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:160 > > > + expected_filename = str(expected_filename) > > > + actual_filename = str(actual_filename) > > This will take expected_filename and try to decode it as ascii. Is that what you intended? If expected_filename is already a str() object it has no effect, but if it's unicode() that's effectively calling filename.encode('ascii') which may not be what you want? (At least that's my understanding.) > > > > Yup, that's what we wanted, except that we actually want "turn this into a raw string so that I can safely join it to other raw strings". We don't want to force every line to ascii, or we'd still run into the problem we have now (expected strings containing non-ascii characters). However, Eric is right that str() on a unicode string with non-ASCII characters will thrown an exception. Using filename.encode('utf-8') (as Ojan suggested) is safer. Will upload a new patch. 279338 13 dpranke 2010-09-14 19:35:24 -0700 (In reply to comment #12) > (In reply to comment #11) > > (In reply to comment #9) > > > (From update of attachment 67626 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=67626&action=prettypatch > > > > > > > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:160 > > > > + expected_filename = str(expected_filename) > > > > + actual_filename = str(actual_filename) > > > This will take expected_filename and try to decode it as ascii. Is that what you intended? If expected_filename is already a str() object it has no effect, but if it's unicode() that's effectively calling filename.encode('ascii') which may not be what you want? (At least that's my understanding.) > > > > > > > Yup, that's what we wanted, except that we actually want "turn this into a raw string so that I can safely join it to other raw strings". We don't want to force every line to ascii, or we'd still run into the problem we have now (expected strings containing non-ascii characters). > > However, Eric is right that str() on a unicode string with non-ASCII characters will thrown an exception. Using filename.encode('utf-8') (as Ojan suggested) is safer. Will upload a new patch. I'm not sure that we actually want to allow non-ASCII filenames, so I'm not sure that this is a bad thing. Lord knows what else would break if we did allow them and one gets checked in. 279341 14 67635 mihaip 2010-09-14 19:43:51 -0700 Created attachment 67635 Patch 279348 15 eric 2010-09-14 20:16:40 -0700 (In reply to comment #13) > I'm not sure that we actually want to allow non-ASCII filenames, so I'm not sure that this is a bad thing. Lord knows what else would break if we did allow them and one gets checked in. We have in the past had non-ascii file names. I believe they had to be removed when the windows port came online. I remember adding some since, but then again having to remove them since they broke on windows. But the general goal of supporting unicode urls and filenames is a good one. We should assume unicode whenever we're dealing with "strings". The str() type in Python was renamed ByteArray() in Python 3. and unicode() became the default for "foo". The u"foo" syntax no longer exists in Python 3. This is part of how we always want to use codecs.open for dealing with files and always pass an encoding. codecs.open became open() in Python 3, again as part of moving to real unicode support throughout the interpreter. (I've not used Python 3, I've just read the unicode powerpoints/docs online as part of the grand "make webkitpy understand unicode, dammit!" project I undertook 9 months ago to make Tor Arne Vestbø not break the commit-queue every time he was involved with a patch. :) 279351 16 67635 mihaip 2010-09-14 20:23:35 -0700 Comment on attachment 67635 Patch Missed a return statement in to_raw_bytes 279355 17 67639 mihaip 2010-09-14 20:27:29 -0700 Created attachment 67639 Patch 279364 18 tony 2010-09-14 20:58:56 -0700 (In reply to comment #15) > (In reply to comment #13) > > I'm not sure that we actually want to allow non-ASCII filenames, so I'm not sure that this is a bad thing. Lord knows what else would break if we did allow them and one gets checked in. > > We have in the past had non-ascii file names. I believe they had to be removed when the windows port came online. I remember adding some since, but then again having to remove them since they broke on windows. But the general goal of supporting unicode urls and filenames is a good one. Where do these filenames come from? On Linux, filenames are just a stream of bytes so you can't always assume unicode and calling encode('utf8') is going to produce "\xef\xbf\xbd"s. Ultimately, I don't think it matters what we do here because for lots of reasons, we're only going to have ascii filenames. If you want to try to future proof the code, I'm not opposed, but I don't think it actually matters. 279375 19 mihaip 2010-09-14 21:44:44 -0700 (In reply to comment #18) > Where do these filenames come from? On Linux, filenames are just a stream of bytes so you can't always assume unicode and calling encode('utf8') is going to produce "\xef\xbf\xbd"s. > > Ultimately, I don't think it matters what we do here because for lots of reasons, we're only going to have ascii filenames. If you want to try to future proof the code, I'm not opposed, but I don't think it actually matters. I just wanted a string with not-valid-in-ASCII characters in them, I got it from http://docs.python.org/howto/unicode.html#unicode-literals-in-python-source-code. If the filenames are not unicode (and just a stream of bytes, i.e. str), then this will degrade fine. 279390 20 eric 2010-09-14 22:36:33 -0700 (In reply to comment #18) > Where do these filenames come from? On Linux, filenames are just a stream of bytes so you can't always assume unicode and calling encode('utf8') is going to produce "\xef\xbf\xbd"s. Mac HFS+ is always utf8 for all paths. But I realize that is not true for all platforms. We've had the non-ascii file names at various times because we need to be able to test handling of non-ascii URLs both locally and remotely for WebKit. There are also handling unicode-aware parsing algorithms for element attributes, etc. In general it's not a huge issue, but we ended up removing these tests due to Windows troubles iirc. > Ultimately, I don't think it matters what we do here because for lots of reasons, we're only going to have ascii filenames. If you want to try to future proof the code, I'm not opposed, but I don't think it actually matters. Agreed. Still is nice to attempt to be sane about unicode. I think the confusion comes here because I read the patch too quickly and didn't realize Mihai's char(255) were how he was getting unicode code points. I'm used to using u"foo\u1235bar" to get unicode codepoints in python. 279391 21 67639 eric 2010-09-14 22:39:29 -0700 Comment on attachment 67639 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67639&action=prettypatch I really need to write some documentation for dealing with unicode vs. byte arrays in webkitpy. > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:162 > + def to_raw_bytes(str): > + if isinstance(str, unicode): > + return str.encode('utf-8') > + return str I suspect other areas of the code I've assumed that file names were unicode strings. If that's not a valid assumption across platforms we're going to have more of these bugs. We may need to make a module-wide fix to this. > WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py:170 > + # actual input is always a raw string, not unicode). I would have said "raw bytes" instead of "raw string", but that's a total nit. > WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py:180 > + # be safe safe. 279566 22 67681 mihaip 2010-09-15 08:58:00 -0700 Created attachment 67681 Patch 279567 23 mihaip 2010-09-15 08:59:08 -0700 (In reply to comment #21) > I suspect other areas of the code I've assumed that file names were unicode strings. If that's not a valid assumption across platforms we're going to have more of these bugs. We may need to make a module-wide fix to this. It's a valid assumption, until we try to combine filenames with their content. Diff output is most likely the only place where we try to do that. > > WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py:170 > > + # actual input is always a raw string, not unicode). > I would have said "raw bytes" instead of "raw string", but that's a total nit. Fixed (in the ChangeLog too) > > WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py:180 > > + # be safe > safe. Fixed. 279589 24 67681 commit-queue 2010-09-15 10:06:22 -0700 Comment on attachment 67681 Patch Clearing flags on attachment: 67681 Committed r67560: <http://trac.webkit.org/changeset/67560> 279590 25 commit-queue 2010-09-15 10:06:28 -0700 All reviewed patches have been landed. Closing bug. 279614 26 webkit.review.bot 2010-09-15 10:41:34 -0700 http://trac.webkit.org/changeset/67560 might have broken GTK Linux 32-bit Release The following changes are on the blame list: http://trac.webkit.org/changeset/67560 http://trac.webkit.org/changeset/67561 279618 27 mihaip 2010-09-15 10:47:48 -0700 (In reply to comment #26) > http://trac.webkit.org/changeset/67560 might have broken GTK Linux 32-bit Release > The following changes are on the blame list: > http://trac.webkit.org/changeset/67560 > http://trac.webkit.org/changeset/67561 Since accessibility/ellipsis-text.html failed, I assume it's r67561's fault. 67626 2010-09-14 17:47:48 -0700 2010-09-14 19:43:47 -0700 Patch bug-45791-20100914174747.patch text/plain 2970 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1YWFkZWM5MGE4NDk5NWYwYWQ4ODFlODRjZmIxNGM5ODEwMTMxZGE3Li4yMDg4NjU1 MDA5OTQyZWRjNzQwZWU1MzRmY2EzNjEwNjVhMGM5N2EzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDktMTQgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTlJXVCBmYWlscyB3 aXRoIFVuaWNvZGVEZWNvZGVFcnJvciBvbiBlZGl0aW5nL3NlbGVjdGlvbi9taXhlZC1lZGl0YWJp bGl0eS0xMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NTc5MQorCisgICAgICAgIEZvcmNlIGZpbGVuYW1lcyB0byBiZSByYXcgc3RyaW5ncyBi ZWZvcmUgcnVubmluZyBkaWZmbGliLnVuaWZpZWRfZGlmZi4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHk6CisKIDIwMTAtMDktMTQg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRl cnMgQ2FybHNzb24uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggOTEyNWY5ZWQyM2Y5MDUyOWYyNWI4NjIzMDYx OGRlYWZjZWQ3Mjk2NS4uYzY3MWZkMjFiNTU5M2ViOTI5MzNjODlhMjlkNjg1ODI3YjMxYzU2MSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9iYXNlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weQpAQCAtMTUyLDYgKzE1MiwxMiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAK ICAgICAgICAgV2hpbGUgdGhpcyBpcyBhIGdlbmVyaWMgcm91dGluZSwgd2UgaW5jbHVkZSBpdCBp biB0aGUgUG9ydAogICAgICAgICBpbnRlcmZhY2Ugc28gdGhhdCBpdCBjYW4gYmUgb3ZlcnJpZGVu IGZvciB0ZXN0aW5nIHB1cnBvc2VzLiIiIgorCisgICAgICAgICMgVGhlIGZpbGVuYW1lcyBzaG93 IHVwIGluIHRoZSBkaWZmIG91dHB1dCwgbWFrZSBzdXJlIHRoZXkncmUKKyAgICAgICAgIyByYXcg c3RyaW5ncyBhbmQgbm90IHVuaWNvZGUsIHNvIHRoYXQgdGhleSBkb24ndCB0cmlnZ2VyIGpvaW4K KyAgICAgICAgIyB0cnlpbmcgdG8gZGVjb2RlIHRoZSBpbnB1dAorICAgICAgICBleHBlY3RlZF9m aWxlbmFtZSA9IHN0cihleHBlY3RlZF9maWxlbmFtZSkKKyAgICAgICAgYWN0dWFsX2ZpbGVuYW1l ID0gc3RyKGFjdHVhbF9maWxlbmFtZSkKICAgICAgICAgZGlmZiA9IGRpZmZsaWIudW5pZmllZF9k aWZmKGV4cGVjdGVkX3RleHQuc3BsaXRsaW5lcyhUcnVlKSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFjdHVhbF90ZXh0LnNwbGl0bGluZXMoVHJ1ZSksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9maWxlbmFtZSwKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0 dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZV91bml0dGVzdC5weQppbmRleCAzOTI2ODM4OGVmOTc0MDc0ZDQyNzEwN2ZhN2M4YWUyMDI0 MDZmN2YxLi42YjRhYWViMjdiMzg0NzdiZmY1OWI4ZGNlZGRlYWNlM2ZhNzM1OGVjIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Vf dW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CkBAIC0xNjMsNiArMTYzLDE3IEBAIGNsYXNzIFBvcnRU ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShiYXNlLl93 ZGlmZl9hdmFpbGFibGUpCiAgICAgICAgIGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKIAor ICAgIGRlZiB0ZXN0X2RpZmZfdGV4dChzZWxmKToKKyAgICAgICAgcG9ydCA9IGJhc2UuUG9ydCgp CisgICAgICAgICMgTWFrZSBzdXJlIHRoYXQgd2UgZG9uJ3QgcnVuIGludG8gZGVjb2RpbmcgZXhj ZXB0aW9ucyB3aGVuIHRoZQorICAgICAgICAjIGZpbGVuYW1lcyBhcmUgdW5pY29kZSwgd2l0aCBy ZWd1bGFyIG9yIG1hbGZvcm1lZCBpbnB1dCAoZXhwZWN0ZWQgb3IKKyAgICAgICAgIyBhY3R1YWwg aW5wdXQgaXMgYWx3YXlzIGEgcmF3IHN0cmluZywgbm90IHVuaWNvZGUpLgorICAgICAgICBwb3J0 LmRpZmZfdGV4dCgnZXhwJywgJ2FjdCcsICdleHAudHh0JywgJ2FjdC50eHQnKQorICAgICAgICBw b3J0LmRpZmZfdGV4dCgnZXhwJywgJ2FjdCcsIHUnZXhwLnR4dCcsICdhY3QudHh0JykKKworICAg ICAgICBwb3J0LmRpZmZfdGV4dCgnZXhwJyArIGNocigyNTUpLCAnYWN0JywgJ2V4cC50eHQnLCAn YWN0LnR4dCcpCisgICAgICAgIHBvcnQuZGlmZl90ZXh0KCdleHAnICsgY2hyKDI1NSksICdhY3Qn LCB1J2V4cC50eHQnLCAnYWN0LnR4dCcpCisKICAgICBkZWYgdGVzdF9kZWZhdWx0X2NvbmZpZ3Vy YXRpb25fbm90Zm91bmQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBVbml0VGVzdFBvcnQoKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGVmYXVsdF9jb25maWd1cmF0aW9uKCksICJSZWxl YXNlIikK 67635 2010-09-14 19:43:51 -0700 2010-09-14 20:23:35 -0700 Patch bug-45791-20100914194350.patch text/plain 3593 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzNDk3ZDMzMjBiNTRkZGQ3YWI4YTM1NTIxMmU5Y2Y0NjY1NDUzMDQ3Li5mNWM1ZmU5 Mjc5Njg1M2JjNGE4N2Q4MzBhOTNjN2IwNzQ2MTYzMTRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAK IDIwMTAtMDktMTQgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTlJXVCBmYWlscyB3 aXRoIFVuaWNvZGVEZWNvZGVFcnJvciBvbiBlZGl0aW5nL3NlbGVjdGlvbi9taXhlZC1lZGl0YWJp bGl0eS0xMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NTc5MQorCisgICAgICAgIEZvcmNlIGZpbGVuYW1lcyB0byBiZSByYXcgc3RyaW5ncyBi ZWZvcmUgcnVubmluZyBkaWZmbGliLnVuaWZpZWRfZGlmZi4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHk6CisKKzIwMTAtMDktMTQg IE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBTZW5kIHdlYmtpdCBhY2Nlc3NpYmlsaXR5IG5v dGlmaWNhdGlvbnMgdG8gQ2hyb21pdW0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCA5MTI1ZjllZDIzZjkwNTI5 ZjI1Yjg2MjMwNjE4ZGVhZmNlZDcyOTY1Li5jMWI1YTgxN2MzYjY4OTQ0Y2UzNzUyOTU2N2ZhZDUz NDk2ZmM4ZWRlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0xNTIsNiArMTUyLDE1IEBAIGNsYXNzIFBvcnQo b2JqZWN0KToKIAogICAgICAgICBXaGlsZSB0aGlzIGlzIGEgZ2VuZXJpYyByb3V0aW5lLCB3ZSBp bmNsdWRlIGl0IGluIHRoZSBQb3J0CiAgICAgICAgIGludGVyZmFjZSBzbyB0aGF0IGl0IGNhbiBi ZSBvdmVycmlkZW4gZm9yIHRlc3RpbmcgcHVycG9zZXMuIiIiCisKKyAgICAgICAgIyBUaGUgZmls ZW5hbWVzIHNob3cgdXAgaW4gdGhlIGRpZmYgb3V0cHV0LCBtYWtlIHN1cmUgdGhleSdyZQorICAg ICAgICAjIHJhdyBzdHJpbmdzIGFuZCBub3QgdW5pY29kZSwgc28gdGhhdCB0aGV5IGRvbid0IHRy aWdnZXIgam9pbgorICAgICAgICAjIHRyeWluZyB0byBkZWNvZGUgdGhlIGlucHV0CisgICAgICAg IGRlZiB0b19yYXdfYnl0ZXMoc3RyKToKKyAgICAgICAgICAgIGlmIGlzaW5zdGFuY2Uoc3RyLCB1 bmljb2RlKToKKyAgICAgICAgICAgICAgICByZXR1cm4gc3RyLmVuY29kZSgndXRmLTgnKQorICAg ICAgICBleHBlY3RlZF9maWxlbmFtZSA9IHRvX3Jhd19ieXRlcyhleHBlY3RlZF9maWxlbmFtZSkK KyAgICAgICAgYWN0dWFsX2ZpbGVuYW1lID0gdG9fcmF3X2J5dGVzKGFjdHVhbF9maWxlbmFtZSkK ICAgICAgICAgZGlmZiA9IGRpZmZsaWIudW5pZmllZF9kaWZmKGV4cGVjdGVkX3RleHQuc3BsaXRs aW5lcyhUcnVlKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdHVhbF90 ZXh0LnNwbGl0bGluZXMoVHJ1ZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBleHBlY3RlZF9maWxlbmFtZSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5weQppbmRleCAz OTI2ODM4OGVmOTc0MDc0ZDQyNzEwN2ZhN2M4YWUyMDI0MDZmN2YxLi5iMWU2OWMxMDZjNDQ1ODI5 ZWQxOTE5NjU0OGNmODM1MjUwYmM2Mjg2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5 CkBAIC0xNjMsNiArMTYzLDI1IEBAIGNsYXNzIFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShiYXNlLl93ZGlmZl9hdmFpbGFibGUpCiAgICAgICAg IGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKIAorICAgIGRlZiB0ZXN0X2RpZmZfdGV4dChz ZWxmKToKKyAgICAgICAgcG9ydCA9IGJhc2UuUG9ydCgpCisgICAgICAgICMgTWFrZSBzdXJlIHRo YXQgd2UgZG9uJ3QgcnVuIGludG8gZGVjb2RpbmcgZXhjZXB0aW9ucyB3aGVuIHRoZQorICAgICAg ICAjIGZpbGVuYW1lcyBhcmUgdW5pY29kZSwgd2l0aCByZWd1bGFyIG9yIG1hbGZvcm1lZCBpbnB1 dCAoZXhwZWN0ZWQgb3IKKyAgICAgICAgIyBhY3R1YWwgaW5wdXQgaXMgYWx3YXlzIGEgcmF3IHN0 cmluZywgbm90IHVuaWNvZGUpLgorICAgICAgICBwb3J0LmRpZmZfdGV4dCgnZXhwJywgJ2FjdCcs ICdleHAudHh0JywgJ2FjdC50eHQnKQorICAgICAgICBwb3J0LmRpZmZfdGV4dCgnZXhwJywgJ2Fj dCcsIHUnZXhwLnR4dCcsICdhY3QudHh0JykKKyAgICAgICAgcG9ydC5kaWZmX3RleHQoJ2V4cCcs ICdhY3QnLCB1J2FceGFjXHUxMjM0XHUyMGFjXFUwMDAwODAwMCcsICdhY3QudHh0JykKKworICAg ICAgICBwb3J0LmRpZmZfdGV4dCgnZXhwJyArIGNocigyNTUpLCAnYWN0JywgJ2V4cC50eHQnLCAn YWN0LnR4dCcpCisgICAgICAgIHBvcnQuZGlmZl90ZXh0KCdleHAnICsgY2hyKDI1NSksICdhY3Qn LCB1J2V4cC50eHQnLCAnYWN0LnR4dCcpCisKKyAgICAgICAgIyBUaG91Z2ggZXhwZWN0ZWQgYW5k IGFjdHVhbCBmaWxlcyBzaG91bGQgYWx3YXlzIGJlIHJlYWQgaW4gd2l0aCBubworICAgICAgICAj IGVuY29kaW5nIChhbmQgYmUgc3RvcmVkIGFzIHN0ciBvYmplY3RzKSwgdGVzdCB1bmljb2RlIGlu cHV0cyBqdXN0IHRvCisgICAgICAgICMgYmUgc2FmZQorICAgICAgICBwb3J0LmRpZmZfdGV4dCh1 J2V4cCcsICdhY3QnLCAnZXhwLnR4dCcsICdhY3QudHh0JykKKyAgICAgICAgcG9ydC5kaWZmX3Rl eHQoCisgICAgICAgICAgICB1J2FceGFjXHUxMjM0XHUyMGFjXFUwMDAwODAwMCcsICdhY3QnLCAn ZXhwLnR4dCcsICdhY3QudHh0JykKKwogICAgIGRlZiB0ZXN0X2RlZmF1bHRfY29uZmlndXJhdGlv bl9ub3Rmb3VuZChzZWxmKToKICAgICAgICAgcG9ydCA9IFVuaXRUZXN0UG9ydCgpCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kZWZhdWx0X2NvbmZpZ3VyYXRpb24oKSwgIlJlbGVhc2Ui KQo= 67639 2010-09-14 20:27:29 -0700 2010-09-15 08:57:56 -0700 Patch bug-45791-20100914202727.patch text/plain 3956 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzNDk3ZDMzMjBiNTRkZGQ3YWI4YTM1NTIxMmU5Y2Y0NjY1NDUzMDQ3Li5mNWM1ZmU5 Mjc5Njg1M2JjNGE4N2Q4MzBhOTNjN2IwNzQ2MTYzMTRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAK IDIwMTAtMDktMTQgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTlJXVCBmYWlscyB3 aXRoIFVuaWNvZGVEZWNvZGVFcnJvciBvbiBlZGl0aW5nL3NlbGVjdGlvbi9taXhlZC1lZGl0YWJp bGl0eS0xMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NTc5MQorCisgICAgICAgIEZvcmNlIGZpbGVuYW1lcyB0byBiZSByYXcgc3RyaW5ncyBi ZWZvcmUgcnVubmluZyBkaWZmbGliLnVuaWZpZWRfZGlmZi4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHk6CisKKzIwMTAtMDktMTQg IE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBTZW5kIHdlYmtpdCBhY2Nlc3NpYmlsaXR5IG5v dGlmaWNhdGlvbnMgdG8gQ2hyb21pdW0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCA5MTI1ZjllZDIzZjkwNTI5 ZjI1Yjg2MjMwNjE4ZGVhZmNlZDcyOTY1Li45YjY4OTI5ZWJiYjk1NzVjYjZhNjZkNmNmODVlYTMz ZjhiN2NhZDQxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0xNTIsNiArMTUyLDE2IEBAIGNsYXNzIFBvcnQo b2JqZWN0KToKIAogICAgICAgICBXaGlsZSB0aGlzIGlzIGEgZ2VuZXJpYyByb3V0aW5lLCB3ZSBp bmNsdWRlIGl0IGluIHRoZSBQb3J0CiAgICAgICAgIGludGVyZmFjZSBzbyB0aGF0IGl0IGNhbiBi ZSBvdmVycmlkZW4gZm9yIHRlc3RpbmcgcHVycG9zZXMuIiIiCisKKyAgICAgICAgIyBUaGUgZmls ZW5hbWVzIHNob3cgdXAgaW4gdGhlIGRpZmYgb3V0cHV0LCBtYWtlIHN1cmUgdGhleSdyZQorICAg ICAgICAjIHJhdyBzdHJpbmdzIGFuZCBub3QgdW5pY29kZSwgc28gdGhhdCB0aGV5IGRvbid0IHRy aWdnZXIgam9pbgorICAgICAgICAjIHRyeWluZyB0byBkZWNvZGUgdGhlIGlucHV0CisgICAgICAg IGRlZiB0b19yYXdfYnl0ZXMoc3RyKToKKyAgICAgICAgICAgIGlmIGlzaW5zdGFuY2Uoc3RyLCB1 bmljb2RlKToKKyAgICAgICAgICAgICAgICByZXR1cm4gc3RyLmVuY29kZSgndXRmLTgnKQorICAg ICAgICAgICAgcmV0dXJuIHN0cgorICAgICAgICBleHBlY3RlZF9maWxlbmFtZSA9IHRvX3Jhd19i eXRlcyhleHBlY3RlZF9maWxlbmFtZSkKKyAgICAgICAgYWN0dWFsX2ZpbGVuYW1lID0gdG9fcmF3 X2J5dGVzKGFjdHVhbF9maWxlbmFtZSkKICAgICAgICAgZGlmZiA9IGRpZmZsaWIudW5pZmllZF9k aWZmKGV4cGVjdGVkX3RleHQuc3BsaXRsaW5lcyhUcnVlKSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFjdHVhbF90ZXh0LnNwbGl0bGluZXMoVHJ1ZSksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9maWxlbmFtZSwKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0 dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZV91bml0dGVzdC5weQppbmRleCAzOTI2ODM4OGVmOTc0MDc0ZDQyNzEwN2ZhN2M4YWUyMDI0 MDZmN2YxLi41NTYyMzM4NjlhMzJjMTZjZjRkOGE4N2M3YWE2MTRmYTJhNGNkYjc1IDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Vf dW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CkBAIC0xNjMsNiArMTYzLDMzIEBAIGNsYXNzIFBvcnRU ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShiYXNlLl93 ZGlmZl9hdmFpbGFibGUpCiAgICAgICAgIGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKIAor ICAgIGRlZiB0ZXN0X2RpZmZfdGV4dChzZWxmKToKKyAgICAgICAgcG9ydCA9IGJhc2UuUG9ydCgp CisgICAgICAgICMgTWFrZSBzdXJlIHRoYXQgd2UgZG9uJ3QgcnVuIGludG8gZGVjb2RpbmcgZXhj ZXB0aW9ucyB3aGVuIHRoZQorICAgICAgICAjIGZpbGVuYW1lcyBhcmUgdW5pY29kZSwgd2l0aCBy ZWd1bGFyIG9yIG1hbGZvcm1lZCBpbnB1dCAoZXhwZWN0ZWQgb3IKKyAgICAgICAgIyBhY3R1YWwg aW5wdXQgaXMgYWx3YXlzIGEgcmF3IHN0cmluZywgbm90IHVuaWNvZGUpLgorICAgICAgICBwb3J0 LmRpZmZfdGV4dCgnZXhwJywgJ2FjdCcsICdleHAudHh0JywgJ2FjdC50eHQnKQorICAgICAgICBw b3J0LmRpZmZfdGV4dCgnZXhwJywgJ2FjdCcsIHUnZXhwLnR4dCcsICdhY3QudHh0JykKKyAgICAg ICAgcG9ydC5kaWZmX3RleHQoJ2V4cCcsICdhY3QnLCB1J2FceGFjXHUxMjM0XHUyMGFjXFUwMDAw ODAwMCcsICdhY3QudHh0JykKKworICAgICAgICBwb3J0LmRpZmZfdGV4dCgnZXhwJyArIGNocigy NTUpLCAnYWN0JywgJ2V4cC50eHQnLCAnYWN0LnR4dCcpCisgICAgICAgIHBvcnQuZGlmZl90ZXh0 KCdleHAnICsgY2hyKDI1NSksICdhY3QnLCB1J2V4cC50eHQnLCAnYWN0LnR4dCcpCisKKyAgICAg ICAgIyBUaG91Z2ggZXhwZWN0ZWQgYW5kIGFjdHVhbCBmaWxlcyBzaG91bGQgYWx3YXlzIGJlIHJl YWQgaW4gd2l0aCBubworICAgICAgICAjIGVuY29kaW5nIChhbmQgYmUgc3RvcmVkIGFzIHN0ciBv YmplY3RzKSwgdGVzdCB1bmljb2RlIGlucHV0cyBqdXN0IHRvCisgICAgICAgICMgYmUgc2FmZQor ICAgICAgICBwb3J0LmRpZmZfdGV4dCh1J2V4cCcsICdhY3QnLCAnZXhwLnR4dCcsICdhY3QudHh0 JykKKyAgICAgICAgcG9ydC5kaWZmX3RleHQoCisgICAgICAgICAgICB1J2FceGFjXHUxMjM0XHUy MGFjXFUwMDAwODAwMCcsICdhY3QnLCAnZXhwLnR4dCcsICdhY3QudHh0JykKKworICAgICAgICAj IEFuZCBtYWtlIHN1cmUgd2UgYWN0dWFsbHkgZ2V0IGRpZmYgb3V0cHV0CisgICAgICAgIGRpZmYg PSBwb3J0LmRpZmZfdGV4dCgnZm9vJywgJ2JhcicsICdleHAudHh0JywgJ2FjdC50eHQnKQorICAg ICAgICBzZWxmLmFzc2VydFRydWUoJ2ZvbycgaW4gZGlmZikKKyAgICAgICAgc2VsZi5hc3NlcnRU cnVlKCdiYXInIGluIGRpZmYpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnZXhwLnR4dCcgaW4g ZGlmZikKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdhY3QudHh0JyBpbiBkaWZmKQorICAgICAg ICBzZWxmLmFzc2VydEZhbHNlKCdub3N1Y2h0aGluZycgaW4gZGlmZikKKwogICAgIGRlZiB0ZXN0 X2RlZmF1bHRfY29uZmlndXJhdGlvbl9ub3Rmb3VuZChzZWxmKToKICAgICAgICAgcG9ydCA9IFVu aXRUZXN0UG9ydCgpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kZWZhdWx0X2NvbmZp Z3VyYXRpb24oKSwgIlJlbGVhc2UiKQo= 67681 2010-09-15 08:58:00 -0700 2010-09-15 10:06:22 -0700 Patch bug-45791-20100915085758.patch text/plain 3901 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzMWQzNzIyMGQ0YTgxNGUzMDJhMDBiMjE2YWEzMDBmODQ4YjM1MDUyLi41MmUyMzE1 YTkzZGQ5YTMzODZiODBlYTI2ODkxZjc5ZGU4ODViNDdmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDktMTQgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTlJXVCBmYWlscyB3 aXRoIFVuaWNvZGVEZWNvZGVFcnJvciBvbiBlZGl0aW5nL3NlbGVjdGlvbi9taXhlZC1lZGl0YWJp bGl0eS0xMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NTc5MQorCisgICAgICAgIEZvcmNlIGZpbGVuYW1lcyB0byBiZSByYXcgYnl0ZXMgYmVm b3JlIHJ1bm5pbmcgZGlmZmxpYi51bmlmaWVkX2RpZmYuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5OgorCiAyMDEwLTA5LTE1ICBT aW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBUb3IgQXJuZSBWZXN0YsO4LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDkxMjVmOWVkMjNmOTA1 MjlmMjViODYyMzA2MThkZWFmY2VkNzI5NjUuLmMyMWM4ODk0N2JjOTdjMDZjYTcwZDk0NjYxOGM1 MGYyZDU5N2Y4NzUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTE1Miw2ICsxNTIsMTYgQEAgY2xhc3MgUG9y dChvYmplY3QpOgogCiAgICAgICAgIFdoaWxlIHRoaXMgaXMgYSBnZW5lcmljIHJvdXRpbmUsIHdl IGluY2x1ZGUgaXQgaW4gdGhlIFBvcnQKICAgICAgICAgaW50ZXJmYWNlIHNvIHRoYXQgaXQgY2Fu IGJlIG92ZXJyaWRlbiBmb3IgdGVzdGluZyBwdXJwb3Nlcy4iIiIKKworICAgICAgICAjIFRoZSBm aWxlbmFtZXMgc2hvdyB1cCBpbiB0aGUgZGlmZiBvdXRwdXQsIG1ha2Ugc3VyZSB0aGV5J3JlCisg ICAgICAgICMgcmF3IGJ5dGVzIGFuZCBub3QgdW5pY29kZSwgc28gdGhhdCB0aGV5IGRvbid0IHRy aWdnZXIgam9pbigpCisgICAgICAgICMgdHJ5aW5nIHRvIGRlY29kZSB0aGUgaW5wdXQuCisgICAg ICAgIGRlZiB0b19yYXdfYnl0ZXMoc3RyKToKKyAgICAgICAgICAgIGlmIGlzaW5zdGFuY2Uoc3Ry LCB1bmljb2RlKToKKyAgICAgICAgICAgICAgICByZXR1cm4gc3RyLmVuY29kZSgndXRmLTgnKQor ICAgICAgICAgICAgcmV0dXJuIHN0cgorICAgICAgICBleHBlY3RlZF9maWxlbmFtZSA9IHRvX3Jh d19ieXRlcyhleHBlY3RlZF9maWxlbmFtZSkKKyAgICAgICAgYWN0dWFsX2ZpbGVuYW1lID0gdG9f cmF3X2J5dGVzKGFjdHVhbF9maWxlbmFtZSkKICAgICAgICAgZGlmZiA9IGRpZmZsaWIudW5pZmll ZF9kaWZmKGV4cGVjdGVkX3RleHQuc3BsaXRsaW5lcyhUcnVlKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFjdHVhbF90ZXh0LnNwbGl0bGluZXMoVHJ1ZSksCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9maWxlbmFtZSwKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91 bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZV91bml0dGVzdC5weQppbmRleCAzOTI2ODM4OGVmOTc0MDc0ZDQyNzEwN2ZhN2M4YWUy MDI0MDZmN2YxLi40MDdiOTA2MWMxZjQ3Y2ExZTc5YjdkYTlkNDMwNWUyYThhMTJjOWQ2IDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jh c2VfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CkBAIC0xNjMsNiArMTYzLDMzIEBAIGNsYXNzIFBv cnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShiYXNl Ll93ZGlmZl9hdmFpbGFibGUpCiAgICAgICAgIGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUK IAorICAgIGRlZiB0ZXN0X2RpZmZfdGV4dChzZWxmKToKKyAgICAgICAgcG9ydCA9IGJhc2UuUG9y dCgpCisgICAgICAgICMgTWFrZSBzdXJlIHRoYXQgd2UgZG9uJ3QgcnVuIGludG8gZGVjb2Rpbmcg ZXhjZXB0aW9ucyB3aGVuIHRoZQorICAgICAgICAjIGZpbGVuYW1lcyBhcmUgdW5pY29kZSwgd2l0 aCByZWd1bGFyIG9yIG1hbGZvcm1lZCBpbnB1dCAoZXhwZWN0ZWQgb3IKKyAgICAgICAgIyBhY3R1 YWwgaW5wdXQgaXMgYWx3YXlzIHJhdyBieXRlcywgbm90IHVuaWNvZGUpLgorICAgICAgICBwb3J0 LmRpZmZfdGV4dCgnZXhwJywgJ2FjdCcsICdleHAudHh0JywgJ2FjdC50eHQnKQorICAgICAgICBw b3J0LmRpZmZfdGV4dCgnZXhwJywgJ2FjdCcsIHUnZXhwLnR4dCcsICdhY3QudHh0JykKKyAgICAg ICAgcG9ydC5kaWZmX3RleHQoJ2V4cCcsICdhY3QnLCB1J2FceGFjXHUxMjM0XHUyMGFjXFUwMDAw ODAwMCcsICdhY3QudHh0JykKKworICAgICAgICBwb3J0LmRpZmZfdGV4dCgnZXhwJyArIGNocigy NTUpLCAnYWN0JywgJ2V4cC50eHQnLCAnYWN0LnR4dCcpCisgICAgICAgIHBvcnQuZGlmZl90ZXh0 KCdleHAnICsgY2hyKDI1NSksICdhY3QnLCB1J2V4cC50eHQnLCAnYWN0LnR4dCcpCisKKyAgICAg ICAgIyBUaG91Z2ggZXhwZWN0ZWQgYW5kIGFjdHVhbCBmaWxlcyBzaG91bGQgYWx3YXlzIGJlIHJl YWQgaW4gd2l0aCBubworICAgICAgICAjIGVuY29kaW5nIChhbmQgYmUgc3RvcmVkIGFzIHN0ciBv YmplY3RzKSwgdGVzdCB1bmljb2RlIGlucHV0cyBqdXN0IHRvCisgICAgICAgICMgYmUgc2FmZS4K KyAgICAgICAgcG9ydC5kaWZmX3RleHQodSdleHAnLCAnYWN0JywgJ2V4cC50eHQnLCAnYWN0LnR4 dCcpCisgICAgICAgIHBvcnQuZGlmZl90ZXh0KAorICAgICAgICAgICAgdSdhXHhhY1x1MTIzNFx1 MjBhY1xVMDAwMDgwMDAnLCAnYWN0JywgJ2V4cC50eHQnLCAnYWN0LnR4dCcpCisKKyAgICAgICAg IyBBbmQgbWFrZSBzdXJlIHdlIGFjdHVhbGx5IGdldCBkaWZmIG91dHB1dC4KKyAgICAgICAgZGlm ZiA9IHBvcnQuZGlmZl90ZXh0KCdmb28nLCAnYmFyJywgJ2V4cC50eHQnLCAnYWN0LnR4dCcpCisg ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnZm9vJyBpbiBkaWZmKQorICAgICAgICBzZWxmLmFzc2Vy dFRydWUoJ2JhcicgaW4gZGlmZikKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdleHAudHh0JyBp biBkaWZmKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJ2FjdC50eHQnIGluIGRpZmYpCisgICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ25vc3VjaHRoaW5nJyBpbiBkaWZmKQorCiAgICAgZGVmIHRl c3RfZGVmYXVsdF9jb25maWd1cmF0aW9uX25vdGZvdW5kKHNlbGYpOgogICAgICAgICBwb3J0ID0g VW5pdFRlc3RQb3J0KCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRlZmF1bHRfY29u ZmlndXJhdGlvbigpLCAiUmVsZWFzZSIpCg==