137586 2014-10-09 17:45:22 -0700 import-w3c-test rewrites relative src paths in ref files incorrectly 2014-10-15 17:13:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rhauck webkit-unassigned bjonesbe commit-queue glenn oldest_to_newest 1040769 0 rhauck 2014-10-09 17:45:22 -0700 There is a bug where <script src="../../../foo.js"></script> gets rewritten as "../../foo.js"></script> when its relative path is updated. The offending LOC is Line 175 in test_converter.py 1040778 1 239587 rhauck 2014-10-09 18:08:55 -0700 Created attachment 239587 Patch 1040962 2 239587 bjonesbe 2014-10-10 10:51:48 -0700 Comment on attachment 239587 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239587&action=review > Tools/ChangeLog:7 > + This patch fixes a bug in test_converter.py where src paths weren't > + getting rewritten properly. It also adds some tests for this case. i think you need to write a better description, it looks like this patch not only fixes src path rewriting, but also adds support for rewriting source paths in style elements. > Tools/Scripts/webkitpy/w3c/test_converter.py:46 > + Nit: This newline is just noise in the diff. > Tools/Scripts/webkitpy/w3c/test_converter.py:154 > + return self.convert_reference_relpaths(converted[1]) > + it looks like you accidentally duplicated this return statement? > Tools/Scripts/webkitpy/w3c/test_converter.py:175 > - converted = self.convert_reference_relpaths(attr_value) > + converted = re.sub(attr_value, self.convert_reference_relpaths(attr_value), converted) I don't think I understand how this fixed the issue. Can you explain? > Tools/Scripts/webkitpy/w3c/test_importer.py:279 > + Nit: This looks line another stray line. 1041676 3 239821 rhauck 2014-10-14 13:53:37 -0700 Created attachment 239821 Patch 1041678 4 239821 bjonesbe 2014-10-14 13:59:41 -0700 Comment on attachment 239821 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239821&action=review You need to rebase the patch, it no longer applies. Also, see below. > Tools/Scripts/webkitpy/w3c/test_converter.py:170 > - for attr_name, attr_value in attrs: > + for attr in attrs: Why the switch here? It seems much more readable to use atter_name and attr_value instead of attr[0] and attr[1]. > Tools/Scripts/webkitpy/w3c/test_converter.py:171 > if attr_name == 'src': attr_name isn't defined. 1041957 5 239821 rhauck 2014-10-15 14:00:54 -0700 Comment on attachment 239821 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239821&action=review >> Tools/Scripts/webkitpy/w3c/test_converter.py:170 >> + for attr in attrs: > > Why the switch here? It seems much more readable to use atter_name and attr_value instead of attr[0] and attr[1]. I mentioned this in my previous patch. I changed this to be more consistent with the other blocks in this function. If you think attr_name/value are better, I can change the other blocks in this function so they are all consistent. what do you think? >> Tools/Scripts/webkitpy/w3c/test_converter.py:171 >> if attr_name == 'src': > > attr_name isn't defined. oops, missed that. I'll fix in next patch. 1041968 6 bjonesbe 2014-10-15 14:32:16 -0700 (In reply to comment #5) > (From update of attachment 239821 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239821&action=review > > >> Tools/Scripts/webkitpy/w3c/test_converter.py:170 > >> + for attr in attrs: > > > > Why the switch here? It seems much more readable to use atter_name and attr_value instead of attr[0] and attr[1]. > > I mentioned this in my previous patch. I changed this to be more consistent with the other blocks in this function. If you think attr_name/value are better, I can change the other blocks in this function so they are all consistent. what do you think? I must have missed that. I think it's always better to have names than random indexes. Indexes are too easy to mess up and are much harder to read. I think it would be better to fix the other blocks in a followup patch, just so that this one can stay focused on the problem at hand. > > >> Tools/Scripts/webkitpy/w3c/test_converter.py:171 > >> if attr_name == 'src': > > > > attr_name isn't defined. > > oops, missed that. I'll fix in next patch. I think you should stick with the names, so might as well leave it, but change how the iteration works. :-) 1041979 7 239898 rhauck 2014-10-15 15:11:08 -0700 Created attachment 239898 Patch 1041990 8 239898 bjonesbe 2014-10-15 15:45:07 -0700 Comment on attachment 239898 Patch Unfortunately, now the test is broken: [1029/1431] webkitpy.w3c.test_converter_unittest.W...Test.test_convert_attributes_if_needed failed: Traceback (most recent call last): File "/Users/bjonesbe/Code/webkit/svn/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py", line 318, in test_convert_attributes_if_needed self.verify_reference_relative_paths(converted, test_reference_support_info) File "/Users/bjonesbe/Code/webkit/svn/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py", line 358, in verify_reference_relative_paths self.assertTrue(expected_tag in converted[1], 'relative path ' + path + ' was not converted correcty') AssertionError: relative path ../../some-script.js was not converted correcty 1041991 9 239903 rhauck 2014-10-15 16:02:44 -0700 Created attachment 239903 Patch 1041999 10 239903 bjonesbe 2014-10-15 16:17:29 -0700 Comment on attachment 239903 Patch r=me 1042014 11 239903 commit-queue 2014-10-15 17:13:19 -0700 Comment on attachment 239903 Patch Clearing flags on attachment: 239903 Committed r174748: <http://trac.webkit.org/changeset/174748> 1042015 12 commit-queue 2014-10-15 17:13:22 -0700 All reviewed patches have been landed. Closing bug. 239587 2014-10-09 18:08:55 -0700 2014-10-14 13:53:34 -0700 Patch bug-137586-20141009181122.patch text/plain 6414 rhauck U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NTUxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTYxYjhmNDI0YWNiYWQ4Y2I0NGRlMDljMzQ5MGZmNjQw MWExZWY5Yi4uNmNlZThkMzM2NDUyMDBlZmViOTljMjZiMzM4MGM1ZDMxZWIyMzNlYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE0LTEwLTA5ICBSZWJlY2NhIEhhdWNrICA8cmhhdWNrQGFkb2JlLmNvbT4KKworICAg ICAgICBpbXBvcnQtdzNjLXRlc3QgcmV3cml0ZXMgcmVsYXRpdmUgc3JjIHBhdGhzIGluIHJlZiBm aWxlcyBpbmNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM3NTg2CisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyBpbiB0ZXN0 X2NvbnZlcnRlci5weSB3aGVyZSBzcmMgcGF0aHMgd2VyZW4ndAorICAgICAgICBnZXR0aW5nIHJl d3JpdHRlbiBwcm9wZXJseS4gSXQgYWxzbyBhZGRzIHNvbWUgdGVzdHMgZm9yIHRoaXMgY2FzZS4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5OgorICAgICAgICAoY29udmVydF9mb3Jf d2Via2l0KToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmNvbnZlcnRfc3R5bGVfZGF0YSk6 CisgICAgICAgIChfVzNDVGVzdENvbnZlcnRlci5jb252ZXJ0X2F0dHJpYnV0ZXNfaWZfbmVlZGVk KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91bml0dGVz dC5weToKKyAgICAgICAgKHRlc3RfY29udmVydF9hdHRyaWJ1dGVzX2lmX25lZWRlZCk6CisgICAg ICAgICh2ZXJpZnlfcmVmZXJlbmNlX3JlbGF0aXZlX3BhdGhzKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5OgorICAgICAgICAoVGVzdEltcG9ydGVyLmlt cG9ydF90ZXN0cyk6CisKIDIwMTQtMTAtMDkgIERhbmEgQnVya2FydCAgPGRidXJrYXJ0QGFwcGxl LmNvbT4KIAogICAgICAgICBBZGQgTWFjIE9TIFlvc2VtaXRlIGRhc2hib2FyZCBzdXBwb3J0Lgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQppbmRleCA1Y2Ni ZDZmMmY2ZjUxNzMyYzBlNWRhODMzODY1Zjc0NzIwYmY0YmFhLi40ZTg3ZmI0ZWNjNTkxMTU1MGE0 YWU0YjMyYTcxZGUyZWNlMjBhNmI3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3czYy90ZXN0X2NvbnZlcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2NvbnZlcnRlci5weQpAQCAtNDMsNiArNDMsNyBAQCBkZWYgY29udmVydF9mb3Jfd2Via2l0 KG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgaG9zdD1Ib3N0KCkp OgogICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgbW9kaWZpZWQgcHJvcGVydGllcyBhbmQgdGhlIG1v ZGlmaWVkIHRleHQgaWYgdGhlIGZpbGUgd2FzIG1vZGlmZWQsIE5vbmUgb3RoZXJ3aXNlLiIiIgog ICAgIGNvbnRlbnRzID0gaG9zdC5maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUoZmlsZW5hbWUp CiAgICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIobmV3X3BhdGgsIGZpbGVuYW1lLCBy ZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0KQorCiAgICAgaWYgZmlsZW5hbWUuZW5kc3dpdGgo Jy5jc3MnKToKICAgICAgICAgcmV0dXJuIGNvbnZlcnRlci5hZGRfd2Via2l0X3ByZWZpeF90b191 bnByZWZpeGVkX3Byb3BlcnRpZXMoY29udGVudHMpCiAgICAgZWxzZToKQEAgLTE0OSw2ICsxNTAs OCBAQCBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihIVE1MUGFyc2VyKToKIAogICAgICAgICByZXR1 cm4gc2VsZi5jb252ZXJ0X3JlZmVyZW5jZV9yZWxwYXRocyhjb252ZXJ0ZWRbMV0pCiAKKyAgICAg ICAgcmV0dXJuIHNlbGYuY29udmVydF9yZWZlcmVuY2VfcmVscGF0aHMoY29udmVydGVkWzFdKQor CiAgICAgZGVmIGNvbnZlcnRfYXR0cmlidXRlc19pZl9uZWVkZWQoc2VsZiwgdGFnLCBhdHRycyk6 CiAgICAgICAgIGNvbnZlcnRlZCA9IHNlbGYuZ2V0X3N0YXJ0dGFnX3RleHQoKQogICAgICAgICBp ZiB0YWcgaW4gKCdzY3JpcHQnLCAnbGluaycpOgpAQCAtMTY1LDExICsxNjgsMTEgQEAgY2xhc3Mg X1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNlcik6CiAgICAgICAgICAgICAgICAgbmV3X3N0eWxl ID0gc2VsZi5jb252ZXJ0X3N0eWxlX2RhdGEoYXR0clsxXSkKICAgICAgICAgICAgICAgICBjb252 ZXJ0ZWQgPSByZS5zdWIoYXR0clsxXSwgbmV3X3N0eWxlLCBjb252ZXJ0ZWQpCiAKLSAgICAgICAg c3JjX3RhZ3MgPSAoJ3NjcmlwdCcsICdpbWcnLCAnZnJhbWUnLCAnaWZyYW1lJywgJ2lucHV0Jywg J2xheWVyJywgJ3RleHRhcmVhJywgJ3ZpZGVvJywgJ2F1ZGlvJykKKyAgICAgICAgc3JjX3RhZ3Mg PSAoJ3NjcmlwdCcsICdzdHlsZScsICdpbWcnLCAnZnJhbWUnLCAnaWZyYW1lJywgJ2lucHV0Jywg J2xheWVyJywgJ3RleHRhcmVhJywgJ3ZpZGVvJywgJ2F1ZGlvJykKICAgICAgICAgaWYgdGFnIGlu IHNyY190YWdzIGFuZCBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gaXMgbm90IE5vbmUgYW5k ICBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gIT0ge306CiAgICAgICAgICAgICBmb3IgYXR0 cl9uYW1lLCBhdHRyX3ZhbHVlIGluIGF0dHJzOgogICAgICAgICAgICAgICAgIGlmIGF0dHJfbmFt ZSA9PSAnc3JjJzoKLSAgICAgICAgICAgICAgICAgICAgY29udmVydGVkID0gc2VsZi5jb252ZXJ0 X3JlZmVyZW5jZV9yZWxwYXRocyhhdHRyX3ZhbHVlKQorICAgICAgICAgICAgICAgICAgICBjb252 ZXJ0ZWQgPSByZS5zdWIoYXR0cl92YWx1ZSwgc2VsZi5jb252ZXJ0X3JlZmVyZW5jZV9yZWxwYXRo cyhhdHRyX3ZhbHVlKSwgY29udmVydGVkKQogCiAgICAgICAgIHNlbGYuY29udmVydGVkX2RhdGEu YXBwZW5kKGNvbnZlcnRlZCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9jb252ZXJ0ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3cz Yy90ZXN0X2NvbnZlcnRlcl91bml0dGVzdC5weQppbmRleCA4OTZiYjZmODUyNTMxZjYxNzMwMjhi MDZkMDFhY2ZjOGI5MmExNzY1Li5kNzdmMTI5ZjYwMzY5MDlhMWMzZDZhZGUyYzk0NjIwZmNjZWIw NjMxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRl cl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZl cnRlcl91bml0dGVzdC5weQpAQCAtMjgxLDYgKzI4MSwzNCBAQCBDT05URU5UIE9GIFRFU1QKICAg ICAgICAgc2VsZi52ZXJpZnlfY29udmVyc2lvbl9oYXBwZW5lZChjb252ZXJ0ZWQpCiAgICAgICAg IHNlbGYudmVyaWZ5X3ByZWZpeGVkX3Byb3BlcnRpZXMoY29udmVydGVkLCB0ZXN0X2NvbnRlbnRb MF0pCiAKKyAgICBkZWYgdGVzdF9jb252ZXJ0X2F0dHJpYnV0ZXNfaWZfbmVlZGVkKHNlbGYpOgor ICAgICAgICAiIiIgVGVzdHMgY29udmVydF9hdHRyaWJ1dGVzX2lmX25lZWRlZCgpIHVzaW5nIGEg cmVmZXJlbmNlIGZpbGUgdGhhdCBoYXMgc29tZSByZWxhdGl2ZSBzcmMgcGF0aHMgIiIiCisKKyAg ICAgICAgdGVzdF9odG1sID0gIiIiPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9z b21lLXNjcmlwdC5qcyI+PC9zY3JpcHQ+Cis8c3R5bGUgc3JjPSIuLi8uLi8uLi9zb21lLXN0eWxl LmNzcyI+PC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGltZyBzcmM9Ii4uLy4uLy4uLy4uL3Nv bWUtaW1hZ2UuanBnIj4KKzwvYm9keT4KKzwvaHRtbD4KKyIiIgorICAgICAgICB0ZXN0X3JlZmVy ZW5jZV9zdXBwb3J0X2luZm8gPSB7J3JlZmVyZW5jZV9yZWxwYXRoJzogJy4uLycsICdmaWxlcyc6 IFsnLi4vLi4vc29tZS1zY3JpcHQuanMnLCAnLi4vLi4vLi4vc29tZS1zdHlsZS5jc3MnLCAnLi4v Li4vLi4vLi4vc29tZS1pbWFnZS5qcGcnXSwgJ2VsZW1lbnRzJzogWydzY3JpcHQnLCAnc3R5bGUn LCAnaW1nJ119CisgICAgICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVyKERVTU1ZX1BB VEgsIERVTU1ZX0ZJTEVOQU1FLCB0ZXN0X3JlZmVyZW5jZV9zdXBwb3J0X2luZm8pCisKKyAgICAg ICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKKyAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQorICAg ICAgICB0cnk6CisgICAgICAgICAgICBjb252ZXJ0ZXIuZmVlZCh0ZXN0X2h0bWwpCisgICAgICAg ICAgICBjb252ZXJ0ZXIuY2xvc2UoKQorICAgICAgICAgICAgY29udmVydGVkID0gY29udmVydGVy Lm91dHB1dCgpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBvYy5yZXN0b3JlX291dHB1 dCgpCisKKyAgICAgICAgc2VsZi52ZXJpZnlfY29udmVyc2lvbl9oYXBwZW5lZChjb252ZXJ0ZWQp CisgICAgICAgIHNlbGYudmVyaWZ5X3JlZmVyZW5jZV9yZWxhdGl2ZV9wYXRocyhjb252ZXJ0ZWQs IHRlc3RfcmVmZXJlbmNlX3N1cHBvcnRfaW5mbykKKwogICAgIGRlZiB2ZXJpZnlfY29udmVyc2lv bl9oYXBwZW5lZChzZWxmLCBjb252ZXJ0ZWQpOgogICAgICAgICBzZWxmLmFzc2VydFRydWUoY29u dmVydGVkLCAiY29udmVyc2lvbiBkaWRuJ3QgaGFwcGVuIikKIApAQCAtMzA4LDYgKzMzNiwxNSBA QCBDT05URU5UIE9GIFRFU1QKICAgICAgICAgZm9yIHRlc3RfcHJvcCBpbiB0ZXN0X3Byb3BlcnRp ZXM6CiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoKHRlc3RfcHJvcCBpbiBjb252ZXJ0ZWRb MV0pLCAnUHJvcGVydHkgJyArIHRlc3RfcHJvcCArICcgbm90IGZvdW5kIGluIGNvbnZlcnRlZCBk b2MnKQogCisgICAgZGVmIHZlcmlmeV9yZWZlcmVuY2VfcmVsYXRpdmVfcGF0aHMoc2VsZiwgY29u dmVydGVkLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvKToKKyAgICAgICAgaWR4ID0gMAorICAgICAg ICBmb3IgcGF0aCBpbiByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvWydmaWxlcyddOgorICAgICAgICAg ICAgZXhwZWN0ZWRfcGF0aCA9IHJlLnN1YihyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvWydyZWZlcmVu Y2VfcmVscGF0aCddLCAnJywgcGF0aCwgMSkKKyAgICAgICAgICAgIGVsZW1lbnQgPSByZWZlcmVu Y2Vfc3VwcG9ydF9pbmZvWydlbGVtZW50cyddW2lkeF0KKyAgICAgICAgICAgIGV4cGVjdGVkX3Rh ZyA9ICc8JyArIGVsZW1lbnQgKyAnIHNyYz1cIicgKyBleHBlY3RlZF9wYXRoICsgJ1wiPicKKyAg ICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShleHBlY3RlZF90YWcgaW4gY29udmVydGVkWzFdLCAn cmVsYXRpdmUgcGF0aCAnICsgcGF0aCArICcgd2FzIG5vdCBjb252ZXJ0ZWQgY29ycmVjdHknKQor ICAgICAgICAgICAgaWR4ICs9IDEKKwogICAgIGRlZiBnZW5lcmF0ZV90ZXN0X2NvbnRlbnQoc2Vs ZiwgZnVsbF9wcm9wZXJ0eV9saXN0LCBudW1fdGVzdF9wcm9wZXJ0aWVzLCBodG1sKToKICAgICAg ICAgIiIiSW5zZXJ0cyBwcm9wZXJ0aWVzIHJlcXVpcmluZyBhIC13ZWJraXQtIHByZWZpeCBpbnRv IHRoZSBjb250ZW50LCByZXBsYWNpbmcgXCdAdGVzdFhYQFwnIHdpdGggYSBwcm9wZXJ0eS4iIiIK ICAgICAgICAgdGVzdF9wcm9wZXJ0aWVzID0gW10KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3cz Yy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDc1MWU4YjM1OWUxODgyMmMxNDIwZWI2OTdkZWUwMWRj ZGMxZGNmYjMuLjE2Y2IwYmM0YTFlZWE3NGUxMmRhNGIzMTY1NDQ5NjAzNDAzOTZhYWMgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtMjc2LDYgKzI3 Niw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBj b250aW51ZQogCiAgICAgICAgICAgICAgICAgbmV3X2ZpbGVwYXRoID0gb3MucGF0aC5qb2luKG5l d19wYXRoLCBmaWxlX3RvX2NvcHlbJ2Rlc3QnXSkKKwogICAgICAgICAgICAgICAgIGlmICdyZWZl cmVuY2Vfc3VwcG9ydF9pbmZvJyBpbiBmaWxlX3RvX2NvcHkua2V5cygpIGFuZCBmaWxlX3RvX2Nv cHlbJ3JlZmVyZW5jZV9zdXBwb3J0X2luZm8nXSAhPSB7fToKICAgICAgICAgICAgICAgICAgICAg cmVmZXJlbmNlX3N1cHBvcnRfaW5mbyA9IGZpbGVfdG9fY29weVsncmVmZXJlbmNlX3N1cHBvcnRf aW5mbyddCiAgICAgICAgICAgICAgICAgZWxzZToK 239821 2014-10-14 13:53:37 -0700 2014-10-15 15:11:05 -0700 Patch bug-137586-20141014135616.patch text/plain 4973 rhauck U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NTUxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTYxYjhmNDI0YWNiYWQ4Y2I0NGRlMDljMzQ5MGZmNjQw MWExZWY5Yi4uYmRjZjZiOWY2ZDM4YzdiYThlNWM2ZjI5MDRmZWUyODE5YzkwNjM1MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE0LTEwLTE0ICBSZWJlY2NhIEhhdWNrICA8cmhhdWNrQGFkb2JlLmNvbT4KKworICAg ICAgICBpbXBvcnQtdzNjLXRlc3QgcmV3cml0ZXMgcmVsYXRpdmUgc3JjIHBhdGhzIGluIHJlZiBm aWxlcyBpbmNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM3NTg2CisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyBpbiB0ZXN0 X2NvbnZlcnRlci5weSB3aGVyZSBzcmMgcGF0aHMgd2VyZSBnZXR0aW5nIAorICAgICAgICByZXdy aXR0ZW4gYXMgLi4vLi4vc29tZS1wYXRoIGluc3RlYWQgb2YgPHNjcmlwdCBzcmM9Ii4uLy4uL3Nv bWUtcGF0aD4iLiAKKyAgICAgICAgSXQgYWxzbyBhZGRzIHN1cHBvcnQgZm9yIHJld3JpdGluZyBz cmMgcGF0aHMgaW4gc3R5bGUgIGVsZW1lbnRzLCB3aGljaCB3YXMgCisgICAgICAgIG1pc3Npbmcg YmVmb3JlIGFuZCBpdCBhZGRzIHRlc3RzIGZvciB0aGlzIGNhc2UuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2NvbnZlcnRlci5weToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmNvbnZlcnRfYXR0 cmlidXRlc19pZl9uZWVkZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf Y29udmVydGVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9jb252ZXJ0X2F0dHJpYnV0ZXNf aWZfbmVlZGVkKToKKyAgICAgICAgKHZlcmlmeV9yZWZlcmVuY2VfcmVsYXRpdmVfcGF0aHMpOgor CiAyMDE0LTEwLTA5ICBEYW5hIEJ1cmthcnQgIDxkYnVya2FydEBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIE1hYyBPUyBZb3NlbWl0ZSBkYXNoYm9hcmQgc3VwcG9ydC4KZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkKaW5kZXggNWNjYmQ2ZjJmNmY1MTczMmMw ZTVkYTgzMzg2NWY3NDcyMGJmNGJhYS4uZDU1MzIxZDgxYzE2ODFmZjBlNWVhMTkwZjgzMzkyYjBk N2M4M2FmZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252 ZXJ0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIu cHkKQEAgLTE2NSwxMSArMTY1LDEyIEBAIGNsYXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQYXJz ZXIpOgogICAgICAgICAgICAgICAgIG5ld19zdHlsZSA9IHNlbGYuY29udmVydF9zdHlsZV9kYXRh KGF0dHJbMV0pCiAgICAgICAgICAgICAgICAgY29udmVydGVkID0gcmUuc3ViKGF0dHJbMV0sIG5l d19zdHlsZSwgY29udmVydGVkKQogCi0gICAgICAgIHNyY190YWdzID0gKCdzY3JpcHQnLCAnaW1n JywgJ2ZyYW1lJywgJ2lmcmFtZScsICdpbnB1dCcsICdsYXllcicsICd0ZXh0YXJlYScsICd2aWRl bycsICdhdWRpbycpCisgICAgICAgIHNyY190YWdzID0gKCdzY3JpcHQnLCAnc3R5bGUnLCAnaW1n JywgJ2ZyYW1lJywgJ2lmcmFtZScsICdpbnB1dCcsICdsYXllcicsICd0ZXh0YXJlYScsICd2aWRl bycsICdhdWRpbycpCiAgICAgICAgIGlmIHRhZyBpbiBzcmNfdGFncyBhbmQgc2VsZi5yZWZlcmVu Y2Vfc3VwcG9ydF9pbmZvIGlzIG5vdCBOb25lIGFuZCAgc2VsZi5yZWZlcmVuY2Vfc3VwcG9ydF9p bmZvICE9IHt9OgotICAgICAgICAgICAgZm9yIGF0dHJfbmFtZSwgYXR0cl92YWx1ZSBpbiBhdHRy czoKKyAgICAgICAgICAgIGZvciBhdHRyIGluIGF0dHJzOgogICAgICAgICAgICAgICAgIGlmIGF0 dHJfbmFtZSA9PSAnc3JjJzoKLSAgICAgICAgICAgICAgICAgICAgY29udmVydGVkID0gc2VsZi5j b252ZXJ0X3JlZmVyZW5jZV9yZWxwYXRocyhhdHRyX3ZhbHVlKQorICAgICAgICAgICAgICAgICAg ICBuZXdfcGF0aCA9IHNlbGYuY29udmVydF9yZWZlcmVuY2VfcmVscGF0aHMoYXR0clsxXSkKKyAg ICAgICAgICAgICAgICAgICAgY29udmVydGVkID0gcmUuc3ViKGF0dHJbMV0sIG5ld19wYXRoLCBj b252ZXJ0ZWQpCiAKICAgICAgICAgc2VsZi5jb252ZXJ0ZWRfZGF0YS5hcHBlbmQoY29udmVydGVk KQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRl cl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVy X3VuaXR0ZXN0LnB5CmluZGV4IDg5NmJiNmY4NTI1MzFmNjE3MzAyOGIwNmQwMWFjZmM4YjkyYTE3 NjUuLmQ3N2YxMjlmNjAzNjkwOWExYzNkNmFkZTJjOTQ2MjBmY2NlYjA2MzEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0ZXN0LnB5 CkBAIC0yODEsNiArMjgxLDM0IEBAIENPTlRFTlQgT0YgVEVTVAogICAgICAgICBzZWxmLnZlcmlm eV9jb252ZXJzaW9uX2hhcHBlbmVkKGNvbnZlcnRlZCkKICAgICAgICAgc2VsZi52ZXJpZnlfcHJl Zml4ZWRfcHJvcGVydGllcyhjb252ZXJ0ZWQsIHRlc3RfY29udGVudFswXSkKIAorICAgIGRlZiB0 ZXN0X2NvbnZlcnRfYXR0cmlidXRlc19pZl9uZWVkZWQoc2VsZik6CisgICAgICAgICIiIiBUZXN0 cyBjb252ZXJ0X2F0dHJpYnV0ZXNfaWZfbmVlZGVkKCkgdXNpbmcgYSByZWZlcmVuY2UgZmlsZSB0 aGF0IGhhcyBzb21lIHJlbGF0aXZlIHNyYyBwYXRocyAiIiIKKworICAgICAgICB0ZXN0X2h0bWwg PSAiIiI8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3NvbWUtc2NyaXB0LmpzIj48 L3NjcmlwdD4KKzxzdHlsZSBzcmM9Ii4uLy4uLy4uL3NvbWUtc3R5bGUuY3NzIj48L3N0eWxlPgor PC9oZWFkPgorPGJvZHk+Cis8aW1nIHNyYz0iLi4vLi4vLi4vLi4vc29tZS1pbWFnZS5qcGciPgor PC9ib2R5PgorPC9odG1sPgorIiIiCisgICAgICAgIHRlc3RfcmVmZXJlbmNlX3N1cHBvcnRfaW5m byA9IHsncmVmZXJlbmNlX3JlbHBhdGgnOiAnLi4vJywgJ2ZpbGVzJzogWycuLi8uLi9zb21lLXNj cmlwdC5qcycsICcuLi8uLi8uLi9zb21lLXN0eWxlLmNzcycsICcuLi8uLi8uLi8uLi9zb21lLWlt YWdlLmpwZyddLCAnZWxlbWVudHMnOiBbJ3NjcmlwdCcsICdzdHlsZScsICdpbWcnXX0KKyAgICAg ICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIoRFVNTVlfUEFUSCwgRFVNTVlfRklMRU5B TUUsIHRlc3RfcmVmZXJlbmNlX3N1cHBvcnRfaW5mbykKKworICAgICAgICBvYyA9IE91dHB1dENh cHR1cmUoKQorICAgICAgICBvYy5jYXB0dXJlX291dHB1dCgpCisgICAgICAgIHRyeToKKyAgICAg ICAgICAgIGNvbnZlcnRlci5mZWVkKHRlc3RfaHRtbCkKKyAgICAgICAgICAgIGNvbnZlcnRlci5j bG9zZSgpCisgICAgICAgICAgICBjb252ZXJ0ZWQgPSBjb252ZXJ0ZXIub3V0cHV0KCkKKyAgICAg ICAgZmluYWxseToKKyAgICAgICAgICAgIG9jLnJlc3RvcmVfb3V0cHV0KCkKKworICAgICAgICBz ZWxmLnZlcmlmeV9jb252ZXJzaW9uX2hhcHBlbmVkKGNvbnZlcnRlZCkKKyAgICAgICAgc2VsZi52 ZXJpZnlfcmVmZXJlbmNlX3JlbGF0aXZlX3BhdGhzKGNvbnZlcnRlZCwgdGVzdF9yZWZlcmVuY2Vf c3VwcG9ydF9pbmZvKQorCiAgICAgZGVmIHZlcmlmeV9jb252ZXJzaW9uX2hhcHBlbmVkKHNlbGYs IGNvbnZlcnRlZCk6CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShjb252ZXJ0ZWQsICJjb252ZXJz aW9uIGRpZG4ndCBoYXBwZW4iKQogCkBAIC0zMDgsNiArMzM2LDE1IEBAIENPTlRFTlQgT0YgVEVT VAogICAgICAgICBmb3IgdGVzdF9wcm9wIGluIHRlc3RfcHJvcGVydGllczoKICAgICAgICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZSgodGVzdF9wcm9wIGluIGNvbnZlcnRlZFsxXSksICdQcm9wZXJ0eSAn ICsgdGVzdF9wcm9wICsgJyBub3QgZm91bmQgaW4gY29udmVydGVkIGRvYycpCiAKKyAgICBkZWYg dmVyaWZ5X3JlZmVyZW5jZV9yZWxhdGl2ZV9wYXRocyhzZWxmLCBjb252ZXJ0ZWQsIHJlZmVyZW5j ZV9zdXBwb3J0X2luZm8pOgorICAgICAgICBpZHggPSAwCisgICAgICAgIGZvciBwYXRoIGluIHJl ZmVyZW5jZV9zdXBwb3J0X2luZm9bJ2ZpbGVzJ106CisgICAgICAgICAgICBleHBlY3RlZF9wYXRo ID0gcmUuc3ViKHJlZmVyZW5jZV9zdXBwb3J0X2luZm9bJ3JlZmVyZW5jZV9yZWxwYXRoJ10sICcn LCBwYXRoLCAxKQorICAgICAgICAgICAgZWxlbWVudCA9IHJlZmVyZW5jZV9zdXBwb3J0X2luZm9b J2VsZW1lbnRzJ11baWR4XQorICAgICAgICAgICAgZXhwZWN0ZWRfdGFnID0gJzwnICsgZWxlbWVu dCArICcgc3JjPVwiJyArIGV4cGVjdGVkX3BhdGggKyAnXCI+JworICAgICAgICAgICAgc2VsZi5h c3NlcnRUcnVlKGV4cGVjdGVkX3RhZyBpbiBjb252ZXJ0ZWRbMV0sICdyZWxhdGl2ZSBwYXRoICcg KyBwYXRoICsgJyB3YXMgbm90IGNvbnZlcnRlZCBjb3JyZWN0eScpCisgICAgICAgICAgICBpZHgg Kz0gMQorCiAgICAgZGVmIGdlbmVyYXRlX3Rlc3RfY29udGVudChzZWxmLCBmdWxsX3Byb3BlcnR5 X2xpc3QsIG51bV90ZXN0X3Byb3BlcnRpZXMsIGh0bWwpOgogICAgICAgICAiIiJJbnNlcnRzIHBy b3BlcnRpZXMgcmVxdWlyaW5nIGEgLXdlYmtpdC0gcHJlZml4IGludG8gdGhlIGNvbnRlbnQsIHJl cGxhY2luZyBcJ0B0ZXN0WFhAXCcgd2l0aCBhIHByb3BlcnR5LiIiIgogICAgICAgICB0ZXN0X3By b3BlcnRpZXMgPSBbXQo= 239898 2014-10-15 15:11:08 -0700 2014-10-15 16:02:40 -0700 Patch bug-137586-20141015151350.patch text/plain 5212 rhauck U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NzQ0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDJmNzdjNTM3NzNmNDU5MzY2N2U5ZmViNGJlZDA5ZTI4 YzE1ZDAxNi4uNGFmZjgwMjY0NjI2MTJmMmM1MmMyODY2MjllYmMxODhjOTYyMjViMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE0LTEwLTE1ICBSZWJlY2NhIEhhdWNrICA8cmhhdWNrQGFkb2JlLmNvbT4KKworICAg ICAgICBpbXBvcnQtdzNjLXRlc3QgcmV3cml0ZXMgcmVsYXRpdmUgc3JjIHBhdGhzIGluIHJlZiBm aWxlcyBpbmNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM3NTg2CisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyBpbiB0ZXN0 X2NvbnZlcnRlci5weSB3aGVyZSBzcmMgcGF0aHMgd2VyZSBnZXR0aW5nIAorICAgICAgICByZXdy aXR0ZW4gYXMgLi4vLi4vc29tZS1wYXRoIGluc3RlYWQgb2YgPHNjcmlwdCBzcmM9Ii4uLy4uL3Nv bWUtcGF0aD4iLiAKKyAgICAgICAgSXQgYWxzbyBhZGRzIHN1cHBvcnQgZm9yIHJld3JpdGluZyBz cmMgcGF0aHMgaW4gc3R5bGUgIGVsZW1lbnRzLCB3aGljaCB3YXMgCisgICAgICAgIG1pc3Npbmcg YmVmb3JlIGFuZCBpdCBhZGRzIHRlc3RzIGZvciB0aGlzIGNhc2UuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2NvbnZlcnRlci5weToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmNvbnZlcnRfYXR0 cmlidXRlc19pZl9uZWVkZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf Y29udmVydGVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9jb252ZXJ0X2F0dHJpYnV0ZXNf aWZfbmVlZGVkKToKKyAgICAgICAgKHZlcmlmeV9yZWZlcmVuY2VfcmVsYXRpdmVfcGF0aHMpOgor CiAyMDE0LTEwLTE1ICBKYWtlIE5pZWxzZW4gIDxqYWNvYl9uaWVsc2VuQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgLS1qc29uIGZsYWcgdG8gdGVzdC13ZWJraXRweSB0byBlbWl0IEpTT04gZm9y bWF0dGVkIHRlc3QgcmVzdWx0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9jb252ZXJ0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Nv bnZlcnRlci5weQppbmRleCBkNDYzNTk2YTdkY2IxZWUwYzUyMDMyNWVjZTAxMTI0YjE1YjgyMzU0 Li40ODBiYzc0YjZlOTIxYTgwZjA2ZjhlODUxZWI4NDNiMGQwMGFkNmRlIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQpAQCAtMTc5LDExICsxNzksMTIg QEAgY2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNlcik6CiAgICAgICAgICAgICAgICAg bmV3X3N0eWxlID0gc2VsZi5jb252ZXJ0X3N0eWxlX2RhdGEoYXR0clsxXSkKICAgICAgICAgICAg ICAgICBjb252ZXJ0ZWQgPSByZS5zdWIoYXR0clsxXSwgbmV3X3N0eWxlLCBjb252ZXJ0ZWQpCiAK LSAgICAgICAgc3JjX3RhZ3MgPSAoJ3NjcmlwdCcsICdpbWcnLCAnZnJhbWUnLCAnaWZyYW1lJywg J2lucHV0JywgJ2xheWVyJywgJ3RleHRhcmVhJywgJ3ZpZGVvJywgJ2F1ZGlvJykKKyAgICAgICAg c3JjX3RhZ3MgPSAoJ3NjcmlwdCcsICdzdHlsZScsICdpbWcnLCAnZnJhbWUnLCAnaWZyYW1lJywg J2lucHV0JywgJ2xheWVyJywgJ3RleHRhcmVhJywgJ3ZpZGVvJywgJ2F1ZGlvJykKICAgICAgICAg aWYgdGFnIGluIHNyY190YWdzIGFuZCBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gaXMgbm90 IE5vbmUgYW5kICBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gIT0ge306CiAgICAgICAgICAg ICBmb3IgYXR0cl9uYW1lLCBhdHRyX3ZhbHVlIGluIGF0dHJzOgogICAgICAgICAgICAgICAgIGlm IGF0dHJfbmFtZSA9PSAnc3JjJzoKLSAgICAgICAgICAgICAgICAgICAgY29udmVydGVkID0gc2Vs Zi5jb252ZXJ0X3JlZmVyZW5jZV9yZWxwYXRocyhhdHRyX3ZhbHVlKQorICAgICAgICAgICAgICAg ICAgICBuZXdfcGF0aCA9IHNlbGYuY29udmVydF9yZWZlcmVuY2VfcmVscGF0aHMoYXR0cl92YWx1 ZSkKKyAgICAgICAgICAgICAgICAgICAgY29udmVydGVkID0gcmUuc3ViKGF0dHJfdmFsdWUsIG5l d19wYXRoLCBjb252ZXJ0ZWQpCiAKICAgICAgICAgc2VsZi5jb252ZXJ0ZWRfZGF0YS5hcHBlbmQo Y29udmVydGVkKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0 X2NvbnZlcnRlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf Y29udmVydGVyX3VuaXR0ZXN0LnB5CmluZGV4IDE3M2JkZDZlNGRkN2UxYzkwNWExMGE3NjE0YzU4 YTIwN2UzZmUyYjEuLjcxZTllYTQ4M2VjYTQzYjMxNjUyOTdiMTNjNzliNzVlOTA5ZTQ3OTYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0 ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3Vu aXR0ZXN0LnB5CkBAIC0yODksNiArMjg5LDM0IEBAIENPTlRFTlQgT0YgVEVTVAogICAgICAgICBz ZWxmLnZlcmlmeV9wcmVmaXhlZF9wcm9wZXJ0aWVzKGNvbnZlcnRlZCwgdGVzdF9jb250ZW50WzBd KQogICAgICAgICBzZWxmLnZlcmlmeV9wcmVmaXhlZF9wcm9wZXJ0eV92YWx1ZXMoY29udmVydGVk LCB0ZXN0X2NvbnRlbnRbMV0pCiAKKyAgICBkZWYgdGVzdF9jb252ZXJ0X2F0dHJpYnV0ZXNfaWZf bmVlZGVkKHNlbGYpOgorICAgICAgICAiIiIgVGVzdHMgY29udmVydF9hdHRyaWJ1dGVzX2lmX25l ZWRlZCgpIHVzaW5nIGEgcmVmZXJlbmNlIGZpbGUgdGhhdCBoYXMgc29tZSByZWxhdGl2ZSBzcmMg cGF0aHMgIiIiCisKKyAgICAgICAgdGVzdF9odG1sID0gIiIiPGh0bWw+Cis8aGVhZD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9zb21lLXNjcmlwdC5qcyI+PC9zY3JpcHQ+Cis8c3R5bGUgc3JjPSIuLi8u Li8uLi9zb21lLXN0eWxlLmNzcyI+PC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGltZyBzcmM9 Ii4uLy4uLy4uLy4uL3NvbWUtaW1hZ2UuanBnIj4KKzwvYm9keT4KKzwvaHRtbD4KKyIiIgorICAg ICAgICB0ZXN0X3JlZmVyZW5jZV9zdXBwb3J0X2luZm8gPSB7J3JlZmVyZW5jZV9yZWxwYXRoJzog Jy4uLycsICdmaWxlcyc6IFsnLi4vLi4vc29tZS1zY3JpcHQuanMnLCAnLi4vLi4vLi4vc29tZS1z dHlsZS5jc3MnLCAnLi4vLi4vLi4vLi4vc29tZS1pbWFnZS5qcGcnXSwgJ2VsZW1lbnRzJzogWydz Y3JpcHQnLCAnc3R5bGUnLCAnaW1nJ119CisgICAgICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29u dmVydGVyKERVTU1ZX1BBVEgsIERVTU1ZX0ZJTEVOQU1FLCB0ZXN0X3JlZmVyZW5jZV9zdXBwb3J0 X2luZm8pCisKKyAgICAgICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKKyAgICAgICAgb2MuY2FwdHVy ZV9vdXRwdXQoKQorICAgICAgICB0cnk6CisgICAgICAgICAgICBjb252ZXJ0ZXIuZmVlZCh0ZXN0 X2h0bWwpCisgICAgICAgICAgICBjb252ZXJ0ZXIuY2xvc2UoKQorICAgICAgICAgICAgY29udmVy dGVkID0gY29udmVydGVyLm91dHB1dCgpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBv Yy5yZXN0b3JlX291dHB1dCgpCisKKyAgICAgICAgc2VsZi52ZXJpZnlfY29udmVyc2lvbl9oYXBw ZW5lZChjb252ZXJ0ZWQpCisgICAgICAgIHNlbGYudmVyaWZ5X3JlZmVyZW5jZV9yZWxhdGl2ZV9w YXRocyhjb252ZXJ0ZWQsIHRlc3RfcmVmZXJlbmNlX3N1cHBvcnRfaW5mbykKKwogICAgIGRlZiB2 ZXJpZnlfY29udmVyc2lvbl9oYXBwZW5lZChzZWxmLCBjb252ZXJ0ZWQpOgogICAgICAgICBzZWxm LmFzc2VydFRydWUoY29udmVydGVkLCAiY29udmVyc2lvbiBkaWRuJ3QgaGFwcGVuIikKIApAQCAt MzIxLDYgKzM0OSwxNSBAQCBDT05URU5UIE9GIFRFU1QKICAgICAgICAgZm9yIHRlc3RfdmFsdWUg aW4gdGVzdF9wcm9wZXJ0eV92YWx1ZXM6CiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoKHRl c3RfdmFsdWUgaW4gY29udmVydGVkWzJdKSwgJ1Byb3BlcnR5IHZhbHVlICcgKyB0ZXN0X3ZhbHVl ICsgJyBub3QgZm91bmQgaW4gY29udmVydGVkIGRvYycpCiAKKyAgICBkZWYgdmVyaWZ5X3JlZmVy ZW5jZV9yZWxhdGl2ZV9wYXRocyhzZWxmLCBjb252ZXJ0ZWQsIHJlZmVyZW5jZV9zdXBwb3J0X2lu Zm8pOgorICAgICAgICBpZHggPSAwCisgICAgICAgIGZvciBwYXRoIGluIHJlZmVyZW5jZV9zdXBw b3J0X2luZm9bJ2ZpbGVzJ106CisgICAgICAgICAgICBleHBlY3RlZF9wYXRoID0gcmUuc3ViKHJl ZmVyZW5jZV9zdXBwb3J0X2luZm9bJ3JlZmVyZW5jZV9yZWxwYXRoJ10sICcnLCBwYXRoLCAxKQor ICAgICAgICAgICAgZWxlbWVudCA9IHJlZmVyZW5jZV9zdXBwb3J0X2luZm9bJ2VsZW1lbnRzJ11b aWR4XQorICAgICAgICAgICAgZXhwZWN0ZWRfdGFnID0gJzwnICsgZWxlbWVudCArICcgc3JjPVwi JyArIGV4cGVjdGVkX3BhdGggKyAnXCI+JworICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGV4 cGVjdGVkX3RhZyBpbiBjb252ZXJ0ZWRbMV0sICdyZWxhdGl2ZSBwYXRoICcgKyBwYXRoICsgJyB3 YXMgbm90IGNvbnZlcnRlZCBjb3JyZWN0eScpCisgICAgICAgICAgICBpZHggKz0gMQorCiAgICAg ZGVmIGdlbmVyYXRlX3Rlc3RfY29udGVudF9wcm9wZXJ0aWVzX2FuZF92YWx1ZXMoc2VsZiwgZnVs bF9wcm9wZXJ0eV9saXN0LCBmdWxseV9wcm9wZXJ0eV92YWx1ZXNfbGlzdCwgbnVtX3Rlc3RfcHJv cGVydGllc19hbmRfdmFsdWVzLCBodG1sKToKICAgICAgICAgIiIiSW5zZXJ0cyBwcm9wZXJ0aWVz IHJlcXVpcmluZyBhIC13ZWJraXQtIHByZWZpeCBpbnRvIHRoZSBjb250ZW50LCByZXBsYWNpbmcg XCdAdGVzdFhYQFwnIHdpdGggYSBwcm9wZXJ0eSBhbmQgXCdAcHJvcHZhbHVlWFhAXCcgd2l0aCBh IHZhbHVlLiIiIgogICAgICAgICB0ZXN0X2NvbnRlbnRfcHJvcGVydGllcyA9IHNlbGYuZ2VuZXJh dGVfdGVzdF9jb250ZW50KGZ1bGxfcHJvcGVydHlfbGlzdCwgbnVtX3Rlc3RfcHJvcGVydGllc19h bmRfdmFsdWVzLCAndGVzdCcsIGh0bWwpCg== 239903 2014-10-15 16:02:44 -0700 2014-10-15 17:13:18 -0700 Patch bug-137586-20141015160525.patch text/plain 5212 rhauck U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NzQ0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDJmNzdjNTM3NzNmNDU5MzY2N2U5ZmViNGJlZDA5ZTI4 YzE1ZDAxNi4uNGFmZjgwMjY0NjI2MTJmMmM1MmMyODY2MjllYmMxODhjOTYyMjViMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE0LTEwLTE1ICBSZWJlY2NhIEhhdWNrICA8cmhhdWNrQGFkb2JlLmNvbT4KKworICAg ICAgICBpbXBvcnQtdzNjLXRlc3QgcmV3cml0ZXMgcmVsYXRpdmUgc3JjIHBhdGhzIGluIHJlZiBm aWxlcyBpbmNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM3NTg2CisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyBpbiB0ZXN0 X2NvbnZlcnRlci5weSB3aGVyZSBzcmMgcGF0aHMgd2VyZSBnZXR0aW5nIAorICAgICAgICByZXdy aXR0ZW4gYXMgLi4vLi4vc29tZS1wYXRoIGluc3RlYWQgb2YgPHNjcmlwdCBzcmM9Ii4uLy4uL3Nv bWUtcGF0aD4iLiAKKyAgICAgICAgSXQgYWxzbyBhZGRzIHN1cHBvcnQgZm9yIHJld3JpdGluZyBz cmMgcGF0aHMgaW4gc3R5bGUgIGVsZW1lbnRzLCB3aGljaCB3YXMgCisgICAgICAgIG1pc3Npbmcg YmVmb3JlIGFuZCBpdCBhZGRzIHRlc3RzIGZvciB0aGlzIGNhc2UuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2NvbnZlcnRlci5weToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmNvbnZlcnRfYXR0 cmlidXRlc19pZl9uZWVkZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf Y29udmVydGVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9jb252ZXJ0X2F0dHJpYnV0ZXNf aWZfbmVlZGVkKToKKyAgICAgICAgKHZlcmlmeV9yZWZlcmVuY2VfcmVsYXRpdmVfcGF0aHMpOgor CiAyMDE0LTEwLTE1ICBKYWtlIE5pZWxzZW4gIDxqYWNvYl9uaWVsc2VuQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgLS1qc29uIGZsYWcgdG8gdGVzdC13ZWJraXRweSB0byBlbWl0IEpTT04gZm9y bWF0dGVkIHRlc3QgcmVzdWx0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9jb252ZXJ0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Nv bnZlcnRlci5weQppbmRleCBkNDYzNTk2YTdkY2IxZWUwYzUyMDMyNWVjZTAxMTI0YjE1YjgyMzU0 Li40ODBiYzc0YjZlOTIxYTgwZjA2ZjhlODUxZWI4NDNiMGQwMGFkNmRlIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQpAQCAtMTc5LDExICsxNzksMTIg QEAgY2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNlcik6CiAgICAgICAgICAgICAgICAg bmV3X3N0eWxlID0gc2VsZi5jb252ZXJ0X3N0eWxlX2RhdGEoYXR0clsxXSkKICAgICAgICAgICAg ICAgICBjb252ZXJ0ZWQgPSByZS5zdWIoYXR0clsxXSwgbmV3X3N0eWxlLCBjb252ZXJ0ZWQpCiAK LSAgICAgICAgc3JjX3RhZ3MgPSAoJ3NjcmlwdCcsICdpbWcnLCAnZnJhbWUnLCAnaWZyYW1lJywg J2lucHV0JywgJ2xheWVyJywgJ3RleHRhcmVhJywgJ3ZpZGVvJywgJ2F1ZGlvJykKKyAgICAgICAg c3JjX3RhZ3MgPSAoJ3NjcmlwdCcsICdzdHlsZScsICdpbWcnLCAnZnJhbWUnLCAnaWZyYW1lJywg J2lucHV0JywgJ2xheWVyJywgJ3RleHRhcmVhJywgJ3ZpZGVvJywgJ2F1ZGlvJykKICAgICAgICAg aWYgdGFnIGluIHNyY190YWdzIGFuZCBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gaXMgbm90 IE5vbmUgYW5kICBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gIT0ge306CiAgICAgICAgICAg ICBmb3IgYXR0cl9uYW1lLCBhdHRyX3ZhbHVlIGluIGF0dHJzOgogICAgICAgICAgICAgICAgIGlm IGF0dHJfbmFtZSA9PSAnc3JjJzoKLSAgICAgICAgICAgICAgICAgICAgY29udmVydGVkID0gc2Vs Zi5jb252ZXJ0X3JlZmVyZW5jZV9yZWxwYXRocyhhdHRyX3ZhbHVlKQorICAgICAgICAgICAgICAg ICAgICBuZXdfcGF0aCA9IHNlbGYuY29udmVydF9yZWZlcmVuY2VfcmVscGF0aHMoYXR0cl92YWx1 ZSkKKyAgICAgICAgICAgICAgICAgICAgY29udmVydGVkID0gcmUuc3ViKGF0dHJfdmFsdWUsIG5l d19wYXRoLCBjb252ZXJ0ZWQpCiAKICAgICAgICAgc2VsZi5jb252ZXJ0ZWRfZGF0YS5hcHBlbmQo Y29udmVydGVkKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0 X2NvbnZlcnRlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf Y29udmVydGVyX3VuaXR0ZXN0LnB5CmluZGV4IDE3M2JkZDZlNGRkN2UxYzkwNWExMGE3NjE0YzU4 YTIwN2UzZmUyYjEuLjVlNTNlODI2MzI2MjdkYWU3YjEwYmMzYWE5NThjZWViNzhmZDBhNTAgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0 ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3Vu aXR0ZXN0LnB5CkBAIC0yODksNiArMjg5LDM0IEBAIENPTlRFTlQgT0YgVEVTVAogICAgICAgICBz ZWxmLnZlcmlmeV9wcmVmaXhlZF9wcm9wZXJ0aWVzKGNvbnZlcnRlZCwgdGVzdF9jb250ZW50WzBd KQogICAgICAgICBzZWxmLnZlcmlmeV9wcmVmaXhlZF9wcm9wZXJ0eV92YWx1ZXMoY29udmVydGVk LCB0ZXN0X2NvbnRlbnRbMV0pCiAKKyAgICBkZWYgdGVzdF9jb252ZXJ0X2F0dHJpYnV0ZXNfaWZf bmVlZGVkKHNlbGYpOgorICAgICAgICAiIiIgVGVzdHMgY29udmVydF9hdHRyaWJ1dGVzX2lmX25l ZWRlZCgpIHVzaW5nIGEgcmVmZXJlbmNlIGZpbGUgdGhhdCBoYXMgc29tZSByZWxhdGl2ZSBzcmMg cGF0aHMgIiIiCisKKyAgICAgICAgdGVzdF9odG1sID0gIiIiPGh0bWw+Cis8aGVhZD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9zb21lLXNjcmlwdC5qcyI+PC9zY3JpcHQ+Cis8c3R5bGUgc3JjPSIuLi8u Li8uLi9zb21lLXN0eWxlLmNzcyI+PC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGltZyBzcmM9 Ii4uLy4uLy4uLy4uL3NvbWUtaW1hZ2UuanBnIj4KKzwvYm9keT4KKzwvaHRtbD4KKyIiIgorICAg ICAgICB0ZXN0X3JlZmVyZW5jZV9zdXBwb3J0X2luZm8gPSB7J3JlZmVyZW5jZV9yZWxwYXRoJzog Jy4uLycsICdmaWxlcyc6IFsnLi4vLi4vc29tZS1zY3JpcHQuanMnLCAnLi4vLi4vLi4vc29tZS1z dHlsZS5jc3MnLCAnLi4vLi4vLi4vLi4vc29tZS1pbWFnZS5qcGcnXSwgJ2VsZW1lbnRzJzogWydz Y3JpcHQnLCAnc3R5bGUnLCAnaW1nJ119CisgICAgICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29u dmVydGVyKERVTU1ZX1BBVEgsIERVTU1ZX0ZJTEVOQU1FLCB0ZXN0X3JlZmVyZW5jZV9zdXBwb3J0 X2luZm8pCisKKyAgICAgICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKKyAgICAgICAgb2MuY2FwdHVy ZV9vdXRwdXQoKQorICAgICAgICB0cnk6CisgICAgICAgICAgICBjb252ZXJ0ZXIuZmVlZCh0ZXN0 X2h0bWwpCisgICAgICAgICAgICBjb252ZXJ0ZXIuY2xvc2UoKQorICAgICAgICAgICAgY29udmVy dGVkID0gY29udmVydGVyLm91dHB1dCgpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBv Yy5yZXN0b3JlX291dHB1dCgpCisKKyAgICAgICAgc2VsZi52ZXJpZnlfY29udmVyc2lvbl9oYXBw ZW5lZChjb252ZXJ0ZWQpCisgICAgICAgIHNlbGYudmVyaWZ5X3JlZmVyZW5jZV9yZWxhdGl2ZV9w YXRocyhjb252ZXJ0ZWQsIHRlc3RfcmVmZXJlbmNlX3N1cHBvcnRfaW5mbykKKwogICAgIGRlZiB2 ZXJpZnlfY29udmVyc2lvbl9oYXBwZW5lZChzZWxmLCBjb252ZXJ0ZWQpOgogICAgICAgICBzZWxm LmFzc2VydFRydWUoY29udmVydGVkLCAiY29udmVyc2lvbiBkaWRuJ3QgaGFwcGVuIikKIApAQCAt MzIxLDYgKzM0OSwxNSBAQCBDT05URU5UIE9GIFRFU1QKICAgICAgICAgZm9yIHRlc3RfdmFsdWUg aW4gdGVzdF9wcm9wZXJ0eV92YWx1ZXM6CiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoKHRl c3RfdmFsdWUgaW4gY29udmVydGVkWzJdKSwgJ1Byb3BlcnR5IHZhbHVlICcgKyB0ZXN0X3ZhbHVl ICsgJyBub3QgZm91bmQgaW4gY29udmVydGVkIGRvYycpCiAKKyAgICBkZWYgdmVyaWZ5X3JlZmVy ZW5jZV9yZWxhdGl2ZV9wYXRocyhzZWxmLCBjb252ZXJ0ZWQsIHJlZmVyZW5jZV9zdXBwb3J0X2lu Zm8pOgorICAgICAgICBpZHggPSAwCisgICAgICAgIGZvciBwYXRoIGluIHJlZmVyZW5jZV9zdXBw b3J0X2luZm9bJ2ZpbGVzJ106CisgICAgICAgICAgICBleHBlY3RlZF9wYXRoID0gcmUuc3ViKHJl ZmVyZW5jZV9zdXBwb3J0X2luZm9bJ3JlZmVyZW5jZV9yZWxwYXRoJ10sICcnLCBwYXRoLCAxKQor ICAgICAgICAgICAgZWxlbWVudCA9IHJlZmVyZW5jZV9zdXBwb3J0X2luZm9bJ2VsZW1lbnRzJ11b aWR4XQorICAgICAgICAgICAgZXhwZWN0ZWRfdGFnID0gJzwnICsgZWxlbWVudCArICcgc3JjPVwi JyArIGV4cGVjdGVkX3BhdGggKyAnXCI+JworICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGV4 cGVjdGVkX3RhZyBpbiBjb252ZXJ0ZWRbMl0sICdyZWxhdGl2ZSBwYXRoICcgKyBwYXRoICsgJyB3 YXMgbm90IGNvbnZlcnRlZCBjb3JyZWN0eScpCisgICAgICAgICAgICBpZHggKz0gMQorCiAgICAg ZGVmIGdlbmVyYXRlX3Rlc3RfY29udGVudF9wcm9wZXJ0aWVzX2FuZF92YWx1ZXMoc2VsZiwgZnVs bF9wcm9wZXJ0eV9saXN0LCBmdWxseV9wcm9wZXJ0eV92YWx1ZXNfbGlzdCwgbnVtX3Rlc3RfcHJv cGVydGllc19hbmRfdmFsdWVzLCBodG1sKToKICAgICAgICAgIiIiSW5zZXJ0cyBwcm9wZXJ0aWVz IHJlcXVpcmluZyBhIC13ZWJraXQtIHByZWZpeCBpbnRvIHRoZSBjb250ZW50LCByZXBsYWNpbmcg XCdAdGVzdFhYQFwnIHdpdGggYSBwcm9wZXJ0eSBhbmQgXCdAcHJvcHZhbHVlWFhAXCcgd2l0aCBh IHZhbHVlLiIiIgogICAgICAgICB0ZXN0X2NvbnRlbnRfcHJvcGVydGllcyA9IHNlbGYuZ2VuZXJh dGVfdGVzdF9jb250ZW50KGZ1bGxfcHJvcGVydHlfbGlzdCwgbnVtX3Rlc3RfcHJvcGVydGllc19h bmRfdmFsdWVzLCAndGVzdCcsIGh0bWwpCg==