179637 2017-11-13 15:01:03 -0800 [Windows] Fix error while launching subprocess on Windows Python 2017-11-15 09:32:22 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 179216 1 basuke basuke achristensen ap basuke bfulgham buildbot commit-queue don.olmstead glenn lforschler pvollan webkit-bug-importer oldest_to_newest 1371100 0 basuke 2017-11-13 15:01:03 -0800 When python try to launch sub process on Windows, the environment variables passing as unicode causes this error: > TypeError: environment can only contain strings 1371121 1 326814 basuke 2017-11-13 15:27:15 -0800 Created attachment 326814 fix Convert environment variables from unicode to str. This is required for Python 2 on Windows. 1371194 2 326835 basuke 2017-11-13 17:56:16 -0800 Created attachment 326835 fix test-webkitpy failure 1371196 3 326835 pvollan 2017-11-13 18:16:46 -0800 Comment on attachment 326835 fix test-webkitpy failure View in context: https://bugs.webkit.org/attachment.cgi?id=326835&action=review > Tools/ChangeLog:6 > + [Windows] Fix error while launching subprocess on Windows Python > + https://bugs.webkit.org/show_bug.cgi?id=179637 > + > + Reviewed by NOBODY (OOPS!). Perhaps you could add an explanation of the problem and the fix in the Changelog? > Tools/Scripts/webkitpy/port/server_process.py:69 > + if env is not None and self._port.host.platform.is_win() and not self._port.host.platform.is_cygwin(): Does the expression 'env is not None' have a more compact form? I think we also should consider adding a 'platform.is_native_win()' function. 1371558 4 326835 achristensen 2017-11-14 13:54:27 -0800 Comment on attachment 326835 fix test-webkitpy failure I agree, I think this should be better organized. 1371625 5 326934 basuke 2017-11-14 16:10:24 -0800 Created attachment 326934 fixed fixed as commented 1371638 6 326939 basuke 2017-11-14 16:26:03 -0800 Created attachment 326939 fix for test-webkitpy 1371649 7 326943 basuke 2017-11-14 16:40:07 -0800 Created attachment 326943 fix conflict 1371652 8 326944 basuke 2017-11-14 16:42:10 -0800 Created attachment 326944 fix CRLF 1371661 9 326946 basuke 2017-11-14 16:47:14 -0800 Created attachment 326946 remove 1371706 10 326946 commit-queue 2017-11-14 19:46:16 -0800 Comment on attachment 326946 remove Clearing flags on attachment: 326946 Committed r224866: <https://trac.webkit.org/changeset/224866> 1371707 11 commit-queue 2017-11-14 19:46:17 -0800 All reviewed patches have been landed. Closing bug. 1371873 12 webkit-bug-importer 2017-11-15 09:32:22 -0800 <rdar://problem/35561889> 326814 2017-11-13 15:27:15 -0800 2017-11-13 17:56:16 -0800 fix bug-179637.diff text/plain 1535 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NjQ4 NDFhZDE4OS4uODYzNjUyNjgxOGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNy0xMS0xMyAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbmRvd3NdIEZpeCBlcnJv ciB3aGlsZSBsYXVuY2hpbmcgc3VicHJvY2VzcyBvbiBXaW5kb3dzIFB5dGhvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3BvcnQvc2VydmVyX3Byb2Nlc3MucHk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9faW5pdF9f KToKKwogMjAxNy0xMS0xMyAgR2FicmllbCBJdmFzY3UgIDxnaXZhc2N1QGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0dUS10gQXV0b21hdGljYWxseSBhZGp1c3QgZm9udCBzaXplIHdoZW4gZ3RrLXhm dC1kcGkgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Nl cnZlcl9wcm9jZXNzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9j ZXNzLnB5CmluZGV4IDM2ZGJlNTMxMmQ1Li5lZjhiOGNlZjYyYyAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQpAQCAtNjUsNiArNjUsMTQgQEAgY2xh c3MgU2VydmVyUHJvY2VzcyhvYmplY3QpOgogICAgICAgICBzZWxmLl9uYW1lID0gbmFtZSAgIyBT aG91bGQgYmUgdGhlIGNvbW1hbmQgbmFtZSAoZS5nLiBEdW1wUmVuZGVyVHJlZSwgSW1hZ2VEaWZm KQogICAgICAgICBzZWxmLl9jbWQgPSBjbWQKICAgICAgICAgc2VsZi5fZW52ID0gZW52CisKKyAg ICAgICAgIyBXaW5kb3dzIGRvZXMgbm90IGFsbG93IHVuaWNvZGUgdmFsdWVzIGluIHRoZSBlbnZp cm9ubWVudAorICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuX3BvcnQuaG9zdC5wbGF0Zm9ybQorICAg ICAgICBpZiBwbGF0Zm9ybS5pc193aW4oKSBhbmQgbm90IHBsYXRmb3JtLmlzX2N5Z3dpbigpOgor ICAgICAgICAgICAgc2VsZi5fZW52ID0ge2tleTogZW52W2tleV0uZW5jb2RlKCd1dGYtOCcpIGZv ciBrZXkgaW4gZW52fQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgc2VsZi5fZW52ID0gZW52 CisKICAgICAgICAgIyBTZXQgaWYgdGhlIHByb2Nlc3Mgb3V0cHV0cyBub24tc3RhbmRhcmQgbmV3 bGluZXMgbGlrZSAnXHJcbicgb3IgJ1xyJy4KICAgICAgICAgIyBEb24ndCBzZXQgaWYgdGhlcmUg d2lsbCBiZSBiaW5hcnkgZGF0YSBvciB0aGUgZGF0YSBtdXN0IGJlIEFTQ0lJIGVuY29kZWQuCiAg ICAgICAgIHNlbGYuX3VuaXZlcnNhbF9uZXdsaW5lcyA9IHVuaXZlcnNhbF9uZXdsaW5lcwo= 326835 2017-11-13 17:56:16 -0800 2017-11-14 16:10:24 -0800 fix test-webkitpy failure bug-179637.diff text/plain 1573 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NjQ4 NDFhZDE4OS4uODYzNjUyNjgxOGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNy0xMS0xMyAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbmRvd3NdIEZpeCBlcnJv ciB3aGlsZSBsYXVuY2hpbmcgc3VicHJvY2VzcyBvbiBXaW5kb3dzIFB5dGhvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3BvcnQvc2VydmVyX3Byb2Nlc3MucHk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9faW5pdF9f KToKKwogMjAxNy0xMS0xMyAgR2FicmllbCBJdmFzY3UgIDxnaXZhc2N1QGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0dUS10gQXV0b21hdGljYWxseSBhZGp1c3QgZm9udCBzaXplIHdoZW4gZ3RrLXhm dC1kcGkgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Nl cnZlcl9wcm9jZXNzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9j ZXNzLnB5CmluZGV4IDM2ZGJlNTMxMmQ1Li4wNTIzMTM0YmZiZSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQpAQCAtNjQsNyArNjQsMTMgQEAgY2xh c3MgU2VydmVyUHJvY2VzcyhvYmplY3QpOgogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydF9vYmoK ICAgICAgICAgc2VsZi5fbmFtZSA9IG5hbWUgICMgU2hvdWxkIGJlIHRoZSBjb21tYW5kIG5hbWUg KGUuZy4gRHVtcFJlbmRlclRyZWUsIEltYWdlRGlmZikKICAgICAgICAgc2VsZi5fY21kID0gY21k Ci0gICAgICAgIHNlbGYuX2VudiA9IGVudgorCisgICAgICAgICMgV2luZG93cyBkb2VzIG5vdCBh bGxvdyB1bmljb2RlIHZhbHVlcyBpbiB0aGUgZW52aXJvbm1lbnQKKyAgICAgICAgaWYgZW52IGlz IG5vdCBOb25lIGFuZCBzZWxmLl9wb3J0Lmhvc3QucGxhdGZvcm0uaXNfd2luKCkgYW5kIG5vdCBz ZWxmLl9wb3J0Lmhvc3QucGxhdGZvcm0uaXNfY3lnd2luKCk6CisgICAgICAgICAgICBzZWxmLl9l bnYgPSB7a2V5OiBlbnZba2V5XS5lbmNvZGUoJ3V0Zi04JykgZm9yIGtleSBpbiBlbnZ9CisgICAg ICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLl9lbnYgPSBlbnYKKwogICAgICAgICAjIFNldCBp ZiB0aGUgcHJvY2VzcyBvdXRwdXRzIG5vbi1zdGFuZGFyZCBuZXdsaW5lcyBsaWtlICdcclxuJyBv ciAnXHInLgogICAgICAgICAjIERvbid0IHNldCBpZiB0aGVyZSB3aWxsIGJlIGJpbmFyeSBkYXRh IG9yIHRoZSBkYXRhIG11c3QgYmUgQVNDSUkgZW5jb2RlZC4KICAgICAgICAgc2VsZi5fdW5pdmVy c2FsX25ld2xpbmVzID0gdW5pdmVyc2FsX25ld2xpbmVzCg== 326934 2017-11-14 16:10:24 -0800 2017-11-14 16:26:03 -0800 fixed bug-179637.diff text/plain 3881 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NjQ4 NDFhLi4xMzdlNTc2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTctMTEtMTQgIEJhc3VrZSBTdXp1a2kgIDxCYXN1 a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBGaXggZXJyb3Igd2hpbGUg bGF1bmNoaW5nIHN1YnByb2Nlc3Mgb24gV2luZG93cyBQeXRob24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTYzNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIHBhc3MgZW52aXJvbm1lbnQgdmFyaWFi bGVzIHRvIHN1YnByb2Nlc3MucG9wZW4gb24gV2luZG93cyBQeXRob24gMiwKKyAgICAgICAgdGhl IGRpY3QgdmFsdWVzIG11c3QgYmUgc3RyIG5vdCB1bmljb2RlLgorICAgICAgICBBbHNvIGlzX25h dGl2ZV93aW4oKSBtZXRob2QgaXMgYWRkZWQgdG8gcG9ydC4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHk6CisgICAgICAgIChQbGF0Zm9y bUluZm8uaXNfbmF0aXZlX3dpbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL3BsYXRmb3JtaW5mb191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RQbGF0Zm9ybUlu Zm8udGVzdF9vc19uYW1lX2FuZF93cmFwcGVycyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2VydmVyUHJvY2Vzcy5fX2luaXRf Xyk6CisKIDIwMTctMTEtMTMgIEdhYnJpZWwgSXZhc2N1ICA8Z2l2YXNjdUBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIEF1dG9tYXRpY2FsbHkgYWRqdXN0IGZvbnQgc2l6ZSB3aGVuIGd0ay14 ZnQtZHBpIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vcGxhdGZvcm1pbmZvLnB5CmluZGV4IGYyNjJhNjYuLjBkYWU0ZTkgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQpA QCAtNzAsNiArNzAsOSBAQCBjbGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICBkZWYgaXNf d2luKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5vc19uYW1lID09ICd3aW4nCiAKKyAgICBk ZWYgaXNfbmF0aXZlX3dpbihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuaXNfd2luKCkgYW5k IG5vdCBzZWxmLmlzX2N5Z3dpbigpCisKICAgICBkZWYgaXNfY3lnd2luKHNlbGYpOgogICAgICAg ICByZXR1cm4gc2VsZi5faXNfY3lnd2luCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fdW5pdHRlc3QucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5CmluZGV4 IGFkY2EzODcuLmU1YmQ1ZGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb191bml0dGVzdC5weQpAQCAtMTExLDYg KzExMSw3IEBAIGNsYXNzIFRlc3RQbGF0Zm9ybUluZm8odW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8uaXNfbGludXgoKSkKICAgICAgICAgc2VsZi5hc3Nl cnRGYWxzZShpbmZvLmlzX21hYygpKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoaW5mby5pc193 aW4oKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGluZm8uaXNfbmF0aXZlX3dpbigpKQogICAg ICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8uaXNfZnJlZWJzZCgpKQogCiAgICAgICAgIGluZm8g PSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnY3lnd2luJyksIGV4ZWN1dGl2ZT1mYWtlX2V4ZWN1 dGl2ZSgnNi4xLjc2MDAnKSkKQEAgLTExOCw2ICsxMTksNyBAQCBjbGFzcyBUZXN0UGxhdGZvcm1J bmZvKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShpbmZvLmlz X2xpbnV4KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5pc19tYWMoKSkKICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGluZm8uaXNfd2luKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RmFs c2UoaW5mby5pc19uYXRpdmVfd2luKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5p c19mcmVlYnNkKCkpCiAKICAgICAgICAgaW5mbyA9IHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCdm cmVlYnNkOCcpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZl cl9wcm9jZXNzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNz LnB5CmluZGV4IDM2ZGJlNTMuLjU4ODE5NzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkKQEAgLTY0LDcgKzY0LDEzIEBAIGNsYXNzIFNlcnZlclBy b2Nlc3Mob2JqZWN0KToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnRfb2JqCiAgICAgICAgIHNl bGYuX25hbWUgPSBuYW1lICAjIFNob3VsZCBiZSB0aGUgY29tbWFuZCBuYW1lIChlLmcuIER1bXBS ZW5kZXJUcmVlLCBJbWFnZURpZmYpCiAgICAgICAgIHNlbGYuX2NtZCA9IGNtZAotICAgICAgICBz ZWxmLl9lbnYgPSBlbnYKKworICAgICAgICAjIFdpbmRvd3MgZG9lcyBub3QgYWxsb3cgdW5pY29k ZSB2YWx1ZXMgaW4gdGhlIGVudmlyb25tZW50CisgICAgICAgIGlmIGVudiBhbmQgc2VsZi5fcG9y dC5ob3N0LnBsYXRmb3JtLmlzX25hdGl2ZV93aW4oKToKKyAgICAgICAgICAgIHNlbGYuX2VudiA9 IHtrZXk6IGVudltrZXldLmVuY29kZSgndXRmLTgnKSBmb3Iga2V5IGluIGVudn0KKyAgICAgICAg ZWxzZToKKyAgICAgICAgICAgIHNlbGYuX2VudiA9IGVudgorCiAgICAgICAgICMgU2V0IGlmIHRo ZSBwcm9jZXNzIG91dHB1dHMgbm9uLXN0YW5kYXJkIG5ld2xpbmVzIGxpa2UgJ1xyXG4nIG9yICdc cicuCiAgICAgICAgICMgRG9uJ3Qgc2V0IGlmIHRoZXJlIHdpbGwgYmUgYmluYXJ5IGRhdGEgb3Ig dGhlIGRhdGEgbXVzdCBiZSBBU0NJSSBlbmNvZGVkLgogICAgICAgICBzZWxmLl91bml2ZXJzYWxf bmV3bGluZXMgPSB1bml2ZXJzYWxfbmV3bGluZXMKQEAgLTc0LDggKzgwLDcgQEAgY2xhc3MgU2Vy dmVyUHJvY2VzcyhvYmplY3QpOgogICAgICAgICBzZWxmLl9yZXNldCgpCiAKICAgICAgICAgIyBT ZWUgY29tbWVudCBpbiBpbXBvcnRzIGZvciB3aHkgd2UgbmVlZCB0aGUgd2luMzIgQVBJcyBhbmQg Y2FuJ3QganVzdCB1c2Ugc2VsZWN0LgotICAgICAgICAjIEZJWE1FOiB0aGVyZSBzaG91bGQgYmUg YSB3YXkgdG8gZ2V0IHdpbjMyIHZzLiBjeWd3aW4gZnJvbSBwbGF0Zm9ybWluZm8uCi0gICAgICAg IHNlbGYuX3VzZV93aW4zMl9hcGlzID0gc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ3dpbicpCisg ICAgICAgIHNlbGYuX3VzZV93aW4zMl9hcGlzID0gc2VsZi5fcG9ydC5ob3N0LnBsYXRmb3JtLmlz X25hdGl2ZV93aW4oKQogCiAgICAgZGVmIHBpZChzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYu X3BpZAo= 326939 2017-11-14 16:26:03 -0800 2017-11-14 16:40:07 -0800 fix for test-webkitpy bug-179637.diff text/plain 9304 basuke //5kAGkAZgBmACAALQAtAGcAaQB0ACAAYQAvAFQAbwBvAGwAcwAvAEMAaABhAG4AZwBlAEwAbwBn ACAAYgAvAFQAbwBvAGwAcwAvAEMAaABhAG4AZwBlAEwAbwBnAA0ACgBpAG4AZABlAHgAIAA3ADYA NAA4ADQAMQBhAC4ALgBjAGQAYQBkADMANAAzACAAMQAwADAANgA0ADQADQAKAC0ALQAtACAAYQAv AFQAbwBvAGwAcwAvAEMAaABhAG4AZwBlAEwAbwBnAA0ACgArACsAKwAgAGIALwBUAG8AbwBsAHMA LwBDAGgAYQBuAGcAZQBMAG8AZwANAAoAQABAACAALQAxACwAMwAgACsAMQAsADIAMwAgAEAAQAAN AAoAKwAyADAAMQA3AC0AMQAxAC0AMQA0ACAAIABCAGEAcwB1AGsAZQAgAFMAdQB6AHUAawBpACAA IAA8AEIAYQBzAHUAawBlAC4AUwB1AHoAdQBrAGkAQABzAG8AbgB5AC4AYwBvAG0APgANAAoAKwAN AAoAKwAgACAAIAAgACAAIAAgACAAWwBXAGkAbgBkAG8AdwBzAF0AIABGAGkAeAAgAGUAcgByAG8A cgAgAHcAaABpAGwAZQAgAGwAYQB1AG4AYwBoAGkAbgBnACAAcwB1AGIAcAByAG8AYwBlAHMAcwAg AG8AbgAgAFcAaQBuAGQAbwB3AHMAIABQAHkAdABoAG8AbgANAAoAKwAgACAAIAAgACAAIAAgACAA aAB0AHQAcABzADoALwAvAGIAdQBnAHMALgB3AGUAYgBrAGkAdAAuAG8AcgBnAC8AcwBoAG8AdwBf AGIAdQBnAC4AYwBnAGkAPwBpAGQAPQAxADcAOQA2ADMANwANAAoAKwANAAoAKwAgACAAIAAgACAA IAAgACAAUgBlAHYAaQBlAHcAZQBkACAAYgB5ACAATgBPAEIATwBEAFkAIAAoAE8ATwBQAFMAIQAp AC4ADQAKACsADQAKACsAIAAgACAAIAAgACAAIAAgAFQAbwAgAHAAYQBzAHMAIABlAG4AdgBpAHIA bwBuAG0AZQBuAHQAIAB2AGEAcgBpAGEAYgBsAGUAcwAgAHQAbwAgAHMAdQBiAHAAcgBvAGMAZQBz AHMALgBwAG8AcABlAG4AIABvAG4AIABXAGkAbgBkAG8AdwBzACAAUAB5AHQAaABvAG4AIAAyACwA DQAKACsAIAAgACAAIAAgACAAIAAgAHQAaABlACAAZABpAGMAdAAgAHYAYQBsAHUAZQBzACAAbQB1 AHMAdAAgAGIAZQAgAHMAdAByACAAbgBvAHQAIAB1AG4AaQBjAG8AZABlAC4ADQAKACsAIAAgACAA IAAgACAAIAAgAEEAbABzAG8AIABpAHMAXwBuAGEAdABpAHYAZQBfAHcAaQBuACgAKQAgAG0AZQB0 AGgAbwBkACAAaQBzACAAYQBkAGQAZQBkACAAdABvACAAcABvAHIAdAAuAA0ACgArAA0ACgArACAA IAAgACAAIAAgACAAIAAqACAAUwBjAHIAaQBwAHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBt AG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwAYQB0AGYAbwByAG0AaQBuAGYAbwAuAHAAeQA6AA0A CgArACAAIAAgACAAIAAgACAAIAAoAFAAbABhAHQAZgBvAHIAbQBJAG4AZgBvAC4AaQBzAF8AbgBh AHQAaQB2AGUAXwB3AGkAbgApADoADQAKACsAIAAgACAAIAAgACAAIAAgACoAIABTAGMAcgBpAHAA dABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4ALwBzAHkAcwB0AGUAbQAvAHAAbABh AHQAZgBvAHIAbQBpAG4AZgBvAF8AbQBvAGMAawAuAHAAeQA6AA0ACgArACAAIAAgACAAIAAgACAA IAAoAE0AbwBjAGsAUABsAGEAdABmAG8AcgBtAEkAbgBmAG8ALgBpAHMAXwBuAGEAdABpAHYAZQBf AHcAaQBuACkAOgANAAoAKwAgACAAIAAgACAAIAAgACAAKgAgAFMAYwByAGkAcAB0AHMALwB3AGUA YgBrAGkAdABwAHkALwBjAG8AbQBtAG8AbgAvAHMAeQBzAHQAZQBtAC8AcABsAGEAdABmAG8AcgBt AGkAbgBmAG8AXwB1AG4AaQB0AHQAZQBzAHQALgBwAHkAOgANAAoAKwAgACAAIAAgACAAIAAgACAA KABUAGUAcwB0AFAAbABhAHQAZgBvAHIAbQBJAG4AZgBvAC4AdABlAHMAdABfAG8AcwBfAG4AYQBt AGUAXwBhAG4AZABfAHcAcgBhAHAAcABlAHIAcwApADoADQAKACsAIAAgACAAIAAgACAAIAAgACoA IABTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AcABvAHIAdAAvAHMAZQByAHYAZQBy AF8AcAByAG8AYwBlAHMAcwAuAHAAeQA6AA0ACgArACAAIAAgACAAIAAgACAAIAAoAFMAZQByAHYA ZQByAFAAcgBvAGMAZQBzAHMALgBfAF8AaQBuAGkAdABfAF8AKQA6AA0ACgArAA0ACgAgADIAMAAx ADcALQAxADEALQAxADMAIAAgAEcAYQBiAHIAaQBlAGwAIABJAHYAYQBzAGMAdQAgACAAPABnAGkA dgBhAHMAYwB1AEAAaQBnAGEAbABpAGEALgBjAG8AbQA+AA0ACgAgAA0ACgAgACAAIAAgACAAIAAg ACAAIABbAEcAVABLAF0AIABBAHUAdABvAG0AYQB0AGkAYwBhAGwAbAB5ACAAYQBkAGoAdQBzAHQA IABmAG8AbgB0ACAAcwBpAHoAZQAgAHcAaABlAG4AIABnAHQAawAtAHgAZgB0AC0AZABwAGkAIABj AGgAYQBuAGcAZQBzAA0ACgBkAGkAZgBmACAALQAtAGcAaQB0ACAAYQAvAFQAbwBvAGwAcwAvAFMA YwByAGkAcAB0AHMALwB3AGUAYgBrAGkAdABwAHkALwBjAG8AbQBtAG8AbgAvAHMAeQBzAHQAZQBt AC8AcABsAGEAdABmAG8AcgBtAGkAbgBmAG8ALgBwAHkAIABiAC8AVABvAG8AbABzAC8AUwBjAHIA aQBwAHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0ALwBw AGwAYQB0AGYAbwByAG0AaQBuAGYAbwAuAHAAeQANAAoAaQBuAGQAZQB4ACAAZgAyADYAMgBhADYA NgAuAC4AMABkAGEAZQA0AGUAOQAgADEAMAAwADYANAA0AA0ACgAtAC0ALQAgAGEALwBUAG8AbwBs AHMALwBTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4ALwBzAHkA cwB0AGUAbQAvAHAAbABhAHQAZgBvAHIAbQBpAG4AZgBvAC4AcAB5AA0ACgArACsAKwAgAGIALwBU AG8AbwBsAHMALwBTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4A LwBzAHkAcwB0AGUAbQAvAHAAbABhAHQAZgBvAHIAbQBpAG4AZgBvAC4AcAB5AA0ACgBAAEAAIAAt ADcAMAAsADYAIAArADcAMAAsADkAIABAAEAAIABjAGwAYQBzAHMAIABQAGwAYQB0AGYAbwByAG0A SQBuAGYAbwAoAG8AYgBqAGUAYwB0ACkAOgANAAoAIAAgACAAIAAgAGQAZQBmACAAaQBzAF8AdwBp AG4AKABzAGUAbABmACkAOgANAAoAIAAgACAAIAAgACAAIAAgACAAcgBlAHQAdQByAG4AIABzAGUA bABmAC4AbwBzAF8AbgBhAG0AZQAgAD0APQAgACcAdwBpAG4AJwANAAoAIAANAAoAKwAgACAAIAAg AGQAZQBmACAAaQBzAF8AbgBhAHQAaQB2AGUAXwB3AGkAbgAoAHMAZQBsAGYAKQA6AA0ACgArACAA IAAgACAAIAAgACAAIAByAGUAdAB1AHIAbgAgAHMAZQBsAGYALgBpAHMAXwB3AGkAbgAoACkAIABh AG4AZAAgAG4AbwB0ACAAcwBlAGwAZgAuAGkAcwBfAGMAeQBnAHcAaQBuACgAKQANAAoAKwANAAoA IAAgACAAIAAgAGQAZQBmACAAaQBzAF8AYwB5AGcAdwBpAG4AKABzAGUAbABmACkAOgANAAoAIAAg ACAAIAAgACAAIAAgACAAcgBlAHQAdQByAG4AIABzAGUAbABmAC4AXwBpAHMAXwBjAHkAZwB3AGkA bgANAAoAIAANAAoAZABpAGYAZgAgAC0ALQBnAGkAdAAgAGEALwBUAG8AbwBsAHMALwBTAGMAcgBp AHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4ALwBzAHkAcwB0AGUAbQAvAHAA bABhAHQAZgBvAHIAbQBpAG4AZgBvAF8AbQBvAGMAawAuAHAAeQAgAGIALwBUAG8AbwBsAHMALwBT AGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4ALwBzAHkAcwB0AGUA bQAvAHAAbABhAHQAZgBvAHIAbQBpAG4AZgBvAF8AbQBvAGMAawAuAHAAeQANAAoAaQBuAGQAZQB4 ACAANQA1AGIAYwAwADQAZAAuAC4ANwBiADgAOABjADAAYQAgADEAMAAwADYANAA0AA0ACgAtAC0A LQAgAGEALwBUAG8AbwBsAHMALwBTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBv AG0AbQBvAG4ALwBzAHkAcwB0AGUAbQAvAHAAbABhAHQAZgBvAHIAbQBpAG4AZgBvAF8AbQBvAGMA awAuAHAAeQANAAoAKwArACsAIABiAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAvAHcAZQBi AGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwAYQB0AGYAbwByAG0A aQBuAGYAbwBfAG0AbwBjAGsALgBwAHkADQAKAEAAQAAgAC0ANAA4ACwANgAgACsANAA4ACwAOQAg AEAAQAAgAGMAbABhAHMAcwAgAE0AbwBjAGsAUABsAGEAdABmAG8AcgBtAEkAbgBmAG8AKABvAGIA agBlAGMAdAApADoADQAKACAAIAAgACAAIABkAGUAZgAgAGkAcwBfAHcAaQBuACgAcwBlAGwAZgAp ADoADQAKACAAIAAgACAAIAAgACAAIAAgAHIAZQB0AHUAcgBuACAAcwBlAGwAZgAuAG8AcwBfAG4A YQBtAGUAIAA9AD0AIAAnAHcAaQBuACcADQAKACAADQAKACsAIAAgACAAIABkAGUAZgAgAGkAcwBf AG4AYQB0AGkAdgBlAF8AdwBpAG4AKABzAGUAbABmACkAOgANAAoAKwAgACAAIAAgACAAIAAgACAA cgBlAHQAdQByAG4AIABzAGUAbABmAC4AaQBzAF8AdwBpAG4AKAApACAAYQBuAGQAIABuAG8AdAAg AHMAZQBsAGYALgBpAHMAXwBjAHkAZwB3AGkAbgAoACkADQAKACsADQAKACAAIAAgACAAIABkAGUA ZgAgAGkAcwBfAGMAeQBnAHcAaQBuACgAcwBlAGwAZgApADoADQAKACAAIAAgACAAIAAgACAAIAAg AHIAZQB0AHUAcgBuACAAcwBlAGwAZgAuAG8AcwBfAG4AYQBtAGUAIAA9AD0AIAAnAGMAeQBnAHcA aQBuACcADQAKACAADQAKAGQAaQBmAGYAIAAtAC0AZwBpAHQAIABhAC8AVABvAG8AbABzAC8AUwBj AHIAaQBwAHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0A LwBwAGwAYQB0AGYAbwByAG0AaQBuAGYAbwBfAHUAbgBpAHQAdABlAHMAdAAuAHAAeQAgAGIALwBU AG8AbwBsAHMALwBTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4A LwBzAHkAcwB0AGUAbQAvAHAAbABhAHQAZgBvAHIAbQBpAG4AZgBvAF8AdQBuAGkAdAB0AGUAcwB0 AC4AcAB5AA0ACgBpAG4AZABlAHgAIABhAGQAYwBhADMAOAA3AC4ALgBlADUAYgBkADUAZABjACAA MQAwADAANgA0ADQADQAKAC0ALQAtACAAYQAvAFQAbwBvAGwAcwAvAFMAYwByAGkAcAB0AHMALwB3 AGUAYgBrAGkAdABwAHkALwBjAG8AbQBtAG8AbgAvAHMAeQBzAHQAZQBtAC8AcABsAGEAdABmAG8A cgBtAGkAbgBmAG8AXwB1AG4AaQB0AHQAZQBzAHQALgBwAHkADQAKACsAKwArACAAYgAvAFQAbwBv AGwAcwAvAFMAYwByAGkAcAB0AHMALwB3AGUAYgBrAGkAdABwAHkALwBjAG8AbQBtAG8AbgAvAHMA eQBzAHQAZQBtAC8AcABsAGEAdABmAG8AcgBtAGkAbgBmAG8AXwB1AG4AaQB0AHQAZQBzAHQALgBw AHkADQAKAEAAQAAgAC0AMQAxADEALAA2ACAAKwAxADEAMQAsADcAIABAAEAAIABjAGwAYQBzAHMA IABUAGUAcwB0AFAAbABhAHQAZgBvAHIAbQBJAG4AZgBvACgAdQBuAGkAdAB0AGUAcwB0AC4AVABl AHMAdABDAGEAcwBlACkAOgANAAoAIAAgACAAIAAgACAAIAAgACAAcwBlAGwAZgAuAGEAcwBzAGUA cgB0AEYAYQBsAHMAZQAoAGkAbgBmAG8ALgBpAHMAXwBsAGkAbgB1AHgAKAApACkADQAKACAAIAAg ACAAIAAgACAAIAAgAHMAZQBsAGYALgBhAHMAcwBlAHIAdABGAGEAbABzAGUAKABpAG4AZgBvAC4A aQBzAF8AbQBhAGMAKAApACkADQAKACAAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBhAHMAcwBl AHIAdABUAHIAdQBlACgAaQBuAGYAbwAuAGkAcwBfAHcAaQBuACgAKQApAA0ACgArACAAIAAgACAA IAAgACAAIABzAGUAbABmAC4AYQBzAHMAZQByAHQAVAByAHUAZQAoAGkAbgBmAG8ALgBpAHMAXwBu AGEAdABpAHYAZQBfAHcAaQBuACgAKQApAA0ACgAgACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4A YQBzAHMAZQByAHQARgBhAGwAcwBlACgAaQBuAGYAbwAuAGkAcwBfAGYAcgBlAGUAYgBzAGQAKAAp ACkADQAKACAADQAKACAAIAAgACAAIAAgACAAIAAgAGkAbgBmAG8AIAA9ACAAcwBlAGwAZgAuAG0A YQBrAGUAXwBpAG4AZgBvACgAZgBhAGsAZQBfAHMAeQBzACgAJwBjAHkAZwB3AGkAbgAnACkALAAg AGUAeABlAGMAdQB0AGkAdgBlAD0AZgBhAGsAZQBfAGUAeABlAGMAdQB0AGkAdgBlACgAJwA2AC4A MQAuADcANgAwADAAJwApACkADQAKAEAAQAAgAC0AMQAxADgALAA2ACAAKwAxADEAOQAsADcAIABA AEAAIABjAGwAYQBzAHMAIABUAGUAcwB0AFAAbABhAHQAZgBvAHIAbQBJAG4AZgBvACgAdQBuAGkA dAB0AGUAcwB0AC4AVABlAHMAdABDAGEAcwBlACkAOgANAAoAIAAgACAAIAAgACAAIAAgACAAcwBl AGwAZgAuAGEAcwBzAGUAcgB0AEYAYQBsAHMAZQAoAGkAbgBmAG8ALgBpAHMAXwBsAGkAbgB1AHgA KAApACkADQAKACAAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBhAHMAcwBlAHIAdABGAGEAbABz AGUAKABpAG4AZgBvAC4AaQBzAF8AbQBhAGMAKAApACkADQAKACAAIAAgACAAIAAgACAAIAAgAHMA ZQBsAGYALgBhAHMAcwBlAHIAdABUAHIAdQBlACgAaQBuAGYAbwAuAGkAcwBfAHcAaQBuACgAKQAp AA0ACgArACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4AYQBzAHMAZQByAHQARgBhAGwAcwBlACgA aQBuAGYAbwAuAGkAcwBfAG4AYQB0AGkAdgBlAF8AdwBpAG4AKAApACkADQAKACAAIAAgACAAIAAg ACAAIAAgAHMAZQBsAGYALgBhAHMAcwBlAHIAdABGAGEAbABzAGUAKABpAG4AZgBvAC4AaQBzAF8A ZgByAGUAZQBiAHMAZAAoACkAKQANAAoAIAANAAoAIAAgACAAIAAgACAAIAAgACAAaQBuAGYAbwAg AD0AIABzAGUAbABmAC4AbQBhAGsAZQBfAGkAbgBmAG8AKABmAGEAawBlAF8AcwB5AHMAKAAnAGYA cgBlAGUAYgBzAGQAOAAnACkAKQANAAoAZABpAGYAZgAgAC0ALQBnAGkAdAAgAGEALwBUAG8AbwBs AHMALwBTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AcABvAHIAdAAvAHMAZQByAHYA ZQByAF8AcAByAG8AYwBlAHMAcwAuAHAAeQAgAGIALwBUAG8AbwBsAHMALwBTAGMAcgBpAHAAdABz AC8AdwBlAGIAawBpAHQAcAB5AC8AcABvAHIAdAAvAHMAZQByAHYAZQByAF8AcAByAG8AYwBlAHMA cwAuAHAAeQANAAoAaQBuAGQAZQB4ACAAMwA2AGQAYgBlADUAMwAuAC4ANQA4ADgAMQA5ADcANQAg ADEAMAAwADYANAA0AA0ACgAtAC0ALQAgAGEALwBUAG8AbwBsAHMALwBTAGMAcgBpAHAAdABzAC8A dwBlAGIAawBpAHQAcAB5AC8AcABvAHIAdAAvAHMAZQByAHYAZQByAF8AcAByAG8AYwBlAHMAcwAu AHAAeQANAAoAKwArACsAIABiAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAvAHcAZQBiAGsA aQB0AHAAeQAvAHAAbwByAHQALwBzAGUAcgB2AGUAcgBfAHAAcgBvAGMAZQBzAHMALgBwAHkADQAK AEAAQAAgAC0ANgA0ACwANwAgACsANgA0ACwAMQAzACAAQABAACAAYwBsAGEAcwBzACAAUwBlAHIA dgBlAHIAUAByAG8AYwBlAHMAcwAoAG8AYgBqAGUAYwB0ACkAOgANAAoAIAAgACAAIAAgACAAIAAg ACAAcwBlAGwAZgAuAF8AcABvAHIAdAAgAD0AIABwAG8AcgB0AF8AbwBiAGoADQAKACAAIAAgACAA IAAgACAAIAAgAHMAZQBsAGYALgBfAG4AYQBtAGUAIAA9ACAAbgBhAG0AZQAgACAAIwAgAFMAaABv AHUAbABkACAAYgBlACAAdABoAGUAIABjAG8AbQBtAGEAbgBkACAAbgBhAG0AZQAgACgAZQAuAGcA LgAgAEQAdQBtAHAAUgBlAG4AZABlAHIAVAByAGUAZQAsACAASQBtAGEAZwBlAEQAaQBmAGYAKQAN AAoAIAAgACAAIAAgACAAIAAgACAAcwBlAGwAZgAuAF8AYwBtAGQAIAA9ACAAYwBtAGQADQAKAC0A IAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBfAGUAbgB2ACAAPQAgAGUAbgB2AA0ACgArAA0ACgAr ACAAIAAgACAAIAAgACAAIAAjACAAVwBpAG4AZABvAHcAcwAgAGQAbwBlAHMAIABuAG8AdAAgAGEA bABsAG8AdwAgAHUAbgBpAGMAbwBkAGUAIAB2AGEAbAB1AGUAcwAgAGkAbgAgAHQAaABlACAAZQBu AHYAaQByAG8AbgBtAGUAbgB0AA0ACgArACAAIAAgACAAIAAgACAAIABpAGYAIABlAG4AdgAgAGEA bgBkACAAcwBlAGwAZgAuAF8AcABvAHIAdAAuAGgAbwBzAHQALgBwAGwAYQB0AGYAbwByAG0ALgBp AHMAXwBuAGEAdABpAHYAZQBfAHcAaQBuACgAKQA6AA0ACgArACAAIAAgACAAIAAgACAAIAAgACAA IAAgAHMAZQBsAGYALgBfAGUAbgB2ACAAPQAgAHsAawBlAHkAOgAgAGUAbgB2AFsAawBlAHkAXQAu AGUAbgBjAG8AZABlACgAJwB1AHQAZgAtADgAJwApACAAZgBvAHIAIABrAGUAeQAgAGkAbgAgAGUA bgB2AH0ADQAKACsAIAAgACAAIAAgACAAIAAgAGUAbABzAGUAOgANAAoAKwAgACAAIAAgACAAIAAg ACAAIAAgACAAIABzAGUAbABmAC4AXwBlAG4AdgAgAD0AIABlAG4AdgANAAoAKwANAAoAIAAgACAA IAAgACAAIAAgACAAIwAgAFMAZQB0ACAAaQBmACAAdABoAGUAIABwAHIAbwBjAGUAcwBzACAAbwB1 AHQAcAB1AHQAcwAgAG4AbwBuAC0AcwB0AGEAbgBkAGEAcgBkACAAbgBlAHcAbABpAG4AZQBzACAA bABpAGsAZQAgACcAXAByAFwAbgAnACAAbwByACAAJwBcAHIAJwAuAA0ACgAgACAAIAAgACAAIAAg ACAAIAAjACAARABvAG4AJwB0ACAAcwBlAHQAIABpAGYAIAB0AGgAZQByAGUAIAB3AGkAbABsACAA YgBlACAAYgBpAG4AYQByAHkAIABkAGEAdABhACAAbwByACAAdABoAGUAIABkAGEAdABhACAAbQB1 AHMAdAAgAGIAZQAgAEEAUwBDAEkASQAgAGUAbgBjAG8AZABlAGQALgANAAoAIAAgACAAIAAgACAA IAAgACAAcwBlAGwAZgAuAF8AdQBuAGkAdgBlAHIAcwBhAGwAXwBuAGUAdwBsAGkAbgBlAHMAIAA9 ACAAdQBuAGkAdgBlAHIAcwBhAGwAXwBuAGUAdwBsAGkAbgBlAHMADQAKAEAAQAAgAC0ANwA0ACwA OAAgACsAOAAwACwANwAgAEAAQAAgAGMAbABhAHMAcwAgAFMAZQByAHYAZQByAFAAcgBvAGMAZQBz AHMAKABvAGIAagBlAGMAdAApADoADQAKACAAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBfAHIA ZQBzAGUAdAAoACkADQAKACAADQAKACAAIAAgACAAIAAgACAAIAAgACMAIABTAGUAZQAgAGMAbwBt AG0AZQBuAHQAIABpAG4AIABpAG0AcABvAHIAdABzACAAZgBvAHIAIAB3AGgAeQAgAHcAZQAgAG4A ZQBlAGQAIAB0AGgAZQAgAHcAaQBuADMAMgAgAEEAUABJAHMAIABhAG4AZAAgAGMAYQBuACcAdAAg AGoAdQBzAHQAIAB1AHMAZQAgAHMAZQBsAGUAYwB0AC4ADQAKAC0AIAAgACAAIAAgACAAIAAgACMA IABGAEkAWABNAEUAOgAgAHQAaABlAHIAZQAgAHMAaABvAHUAbABkACAAYgBlACAAYQAgAHcAYQB5 ACAAdABvACAAZwBlAHQAIAB3AGkAbgAzADIAIAB2AHMALgAgAGMAeQBnAHcAaQBuACAAZgByAG8A bQAgAHAAbABhAHQAZgBvAHIAbQBpAG4AZgBvAC4ADQAKAC0AIAAgACAAIAAgACAAIAAgAHMAZQBs AGYALgBfAHUAcwBlAF8AdwBpAG4AMwAyAF8AYQBwAGkAcwAgAD0AIABzAHkAcwAuAHAAbABhAHQA ZgBvAHIAbQAuAHMAdABhAHIAdABzAHcAaQB0AGgAKAAnAHcAaQBuACcAKQANAAoAKwAgACAAIAAg ACAAIAAgACAAcwBlAGwAZgAuAF8AdQBzAGUAXwB3AGkAbgAzADIAXwBhAHAAaQBzACAAPQAgAHMA ZQBsAGYALgBfAHAAbwByAHQALgBoAG8AcwB0AC4AcABsAGEAdABmAG8AcgBtAC4AaQBzAF8AbgBh AHQAaQB2AGUAXwB3AGkAbgAoACkADQAKACAADQAKACAAIAAgACAAIABkAGUAZgAgAHAAaQBkACgA cwBlAGwAZgApADoADQAKACAAIAAgACAAIAAgACAAIAAgAHIAZQB0AHUAcgBuACAAcwBlAGwAZgAu AF8AcABpAGQADQAKAA== 326943 2017-11-14 16:40:07 -0800 2017-11-14 16:42:10 -0800 fix conflict bug-179637.diff text/plain 9284 basuke //5kAGkAZgBmACAALQAtAGcAaQB0ACAAYQAvAFQAbwBvAGwAcwAvAEMAaABhAG4AZwBlAEwAbwBn ACAAYgAvAFQAbwBvAGwAcwAvAEMAaABhAG4AZwBlAEwAbwBnAA0ACgBpAG4AZABlAHgAIAAxAGEA OAA3ADUAMAA5AC4ALgBkADQAZgBmADgAOQAxACAAMQAwADAANgA0ADQADQAKAC0ALQAtACAAYQAv AFQAbwBvAGwAcwAvAEMAaABhAG4AZwBlAEwAbwBnAA0ACgArACsAKwAgAGIALwBUAG8AbwBsAHMA LwBDAGgAYQBuAGcAZQBMAG8AZwANAAoAQABAACAALQAxACwAMwAgACsAMQAsADIAMwAgAEAAQAAN AAoAKwAyADAAMQA3AC0AMQAxAC0AMQA0ACAAIABCAGEAcwB1AGsAZQAgAFMAdQB6AHUAawBpACAA IAA8AEIAYQBzAHUAawBlAC4AUwB1AHoAdQBrAGkAQABzAG8AbgB5AC4AYwBvAG0APgANAAoAKwAN AAoAKwAgACAAIAAgACAAIAAgACAAWwBXAGkAbgBkAG8AdwBzAF0AIABGAGkAeAAgAGUAcgByAG8A cgAgAHcAaABpAGwAZQAgAGwAYQB1AG4AYwBoAGkAbgBnACAAcwB1AGIAcAByAG8AYwBlAHMAcwAg AG8AbgAgAFcAaQBuAGQAbwB3AHMAIABQAHkAdABoAG8AbgANAAoAKwAgACAAIAAgACAAIAAgACAA aAB0AHQAcABzADoALwAvAGIAdQBnAHMALgB3AGUAYgBrAGkAdAAuAG8AcgBnAC8AcwBoAG8AdwBf AGIAdQBnAC4AYwBnAGkAPwBpAGQAPQAxADcAOQA2ADMANwANAAoAKwANAAoAKwAgACAAIAAgACAA IAAgACAAUgBlAHYAaQBlAHcAZQBkACAAYgB5ACAATgBPAEIATwBEAFkAIAAoAE8ATwBQAFMAIQAp AC4ADQAKACsADQAKACsAIAAgACAAIAAgACAAIAAgAFQAbwAgAHAAYQBzAHMAIABlAG4AdgBpAHIA bwBuAG0AZQBuAHQAIAB2AGEAcgBpAGEAYgBsAGUAcwAgAHQAbwAgAHMAdQBiAHAAcgBvAGMAZQBz AHMALgBwAG8AcABlAG4AIABvAG4AIABXAGkAbgBkAG8AdwBzACAAUAB5AHQAaABvAG4AIAAyACwA DQAKACsAIAAgACAAIAAgACAAIAAgAHQAaABlACAAZABpAGMAdAAgAHYAYQBsAHUAZQBzACAAbQB1 AHMAdAAgAGIAZQAgAHMAdAByACAAbgBvAHQAIAB1AG4AaQBjAG8AZABlAC4ADQAKACsAIAAgACAA IAAgACAAIAAgAEEAbABzAG8AIABpAHMAXwBuAGEAdABpAHYAZQBfAHcAaQBuACgAKQAgAG0AZQB0 AGgAbwBkACAAaQBzACAAYQBkAGQAZQBkACAAdABvACAAcABvAHIAdAAuAA0ACgArAA0ACgArACAA IAAgACAAIAAgACAAIAAqACAAUwBjAHIAaQBwAHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBt AG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwAYQB0AGYAbwByAG0AaQBuAGYAbwAuAHAAeQA6AA0A CgArACAAIAAgACAAIAAgACAAIAAoAFAAbABhAHQAZgBvAHIAbQBJAG4AZgBvAC4AaQBzAF8AbgBh AHQAaQB2AGUAXwB3AGkAbgApADoADQAKACsAIAAgACAAIAAgACAAIAAgACoAIABTAGMAcgBpAHAA dABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4ALwBzAHkAcwB0AGUAbQAvAHAAbABh AHQAZgBvAHIAbQBpAG4AZgBvAF8AbQBvAGMAawAuAHAAeQA6AA0ACgArACAAIAAgACAAIAAgACAA IAAoAE0AbwBjAGsAUABsAGEAdABmAG8AcgBtAEkAbgBmAG8ALgBpAHMAXwBuAGEAdABpAHYAZQBf AHcAaQBuACkAOgANAAoAKwAgACAAIAAgACAAIAAgACAAKgAgAFMAYwByAGkAcAB0AHMALwB3AGUA YgBrAGkAdABwAHkALwBjAG8AbQBtAG8AbgAvAHMAeQBzAHQAZQBtAC8AcABsAGEAdABmAG8AcgBt AGkAbgBmAG8AXwB1AG4AaQB0AHQAZQBzAHQALgBwAHkAOgANAAoAKwAgACAAIAAgACAAIAAgACAA KABUAGUAcwB0AFAAbABhAHQAZgBvAHIAbQBJAG4AZgBvAC4AdABlAHMAdABfAG8AcwBfAG4AYQBt AGUAXwBhAG4AZABfAHcAcgBhAHAAcABlAHIAcwApADoADQAKACsAIAAgACAAIAAgACAAIAAgACoA IABTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AcABvAHIAdAAvAHMAZQByAHYAZQBy AF8AcAByAG8AYwBlAHMAcwAuAHAAeQA6AA0ACgArACAAIAAgACAAIAAgACAAIAAoAFMAZQByAHYA ZQByAFAAcgBvAGMAZQBzAHMALgBfAF8AaQBuAGkAdABfAF8AKQA6AA0ACgArAA0ACgAgADIAMAAx ADcALQAxADEALQAxADQAIAAgAEoAbwBuAGEAdABoAGEAbgAgAEIAZQBkAGEAcgBkACAAIAA8AGoA YgBlAGQAYQByAGQAQABhAHAAcABsAGUALgBjAG8AbQA+AA0ACgAgAA0ACgAgACAAIAAgACAAIAAg ACAAIAB3AGUAYgBrAGkAdABwAHkAOgAgAFUAcwBlACAAbQBvAHIAZQAgAHYAZQByAGIAbwBzAGUA IAB2AGUAcgBzAGkAbwBuACAAaQBuAGYAbwAgAGYAcgBvAG0AIABzAGkAbQBjAHQAbAANAAoAZABp AGYAZgAgAC0ALQBnAGkAdAAgAGEALwBUAG8AbwBsAHMALwBTAGMAcgBpAHAAdABzAC8AdwBlAGIA awBpAHQAcAB5AC8AYwBvAG0AbQBvAG4ALwBzAHkAcwB0AGUAbQAvAHAAbABhAHQAZgBvAHIAbQBp AG4AZgBvAC4AcAB5ACAAYgAvAFQAbwBvAGwAcwAvAFMAYwByAGkAcAB0AHMALwB3AGUAYgBrAGkA dABwAHkALwBjAG8AbQBtAG8AbgAvAHMAeQBzAHQAZQBtAC8AcABsAGEAdABmAG8AcgBtAGkAbgBm AG8ALgBwAHkADQAKAGkAbgBkAGUAeAAgAGYAMgA2ADIAYQA2ADYALgAuADAAZABhAGUANABlADkA IAAxADAAMAA2ADQANAANAAoALQAtAC0AIABhAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAv AHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwAYQB0AGYA bwByAG0AaQBuAGYAbwAuAHAAeQANAAoAKwArACsAIABiAC8AVABvAG8AbABzAC8AUwBjAHIAaQBw AHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwA YQB0AGYAbwByAG0AaQBuAGYAbwAuAHAAeQANAAoAQABAACAALQA3ADAALAA2ACAAKwA3ADAALAA5 ACAAQABAACAAYwBsAGEAcwBzACAAUABsAGEAdABmAG8AcgBtAEkAbgBmAG8AKABvAGIAagBlAGMA dAApADoADQAKACAAIAAgACAAIABkAGUAZgAgAGkAcwBfAHcAaQBuACgAcwBlAGwAZgApADoADQAK ACAAIAAgACAAIAAgACAAIAAgAHIAZQB0AHUAcgBuACAAcwBlAGwAZgAuAG8AcwBfAG4AYQBtAGUA IAA9AD0AIAAnAHcAaQBuACcADQAKACAADQAKACsAIAAgACAAIABkAGUAZgAgAGkAcwBfAG4AYQB0 AGkAdgBlAF8AdwBpAG4AKABzAGUAbABmACkAOgANAAoAKwAgACAAIAAgACAAIAAgACAAcgBlAHQA dQByAG4AIABzAGUAbABmAC4AaQBzAF8AdwBpAG4AKAApACAAYQBuAGQAIABuAG8AdAAgAHMAZQBs AGYALgBpAHMAXwBjAHkAZwB3AGkAbgAoACkADQAKACsADQAKACAAIAAgACAAIABkAGUAZgAgAGkA cwBfAGMAeQBnAHcAaQBuACgAcwBlAGwAZgApADoADQAKACAAIAAgACAAIAAgACAAIAAgAHIAZQB0 AHUAcgBuACAAcwBlAGwAZgAuAF8AaQBzAF8AYwB5AGcAdwBpAG4ADQAKACAADQAKAGQAaQBmAGYA IAAtAC0AZwBpAHQAIABhAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAvAHcAZQBiAGsAaQB0 AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwAYQB0AGYAbwByAG0AaQBuAGYA bwBfAG0AbwBjAGsALgBwAHkAIABiAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAvAHcAZQBi AGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwAYQB0AGYAbwByAG0A aQBuAGYAbwBfAG0AbwBjAGsALgBwAHkADQAKAGkAbgBkAGUAeAAgADUANQBiAGMAMAA0AGQALgAu ADcAYgA4ADgAYwAwAGEAIAAxADAAMAA2ADQANAANAAoALQAtAC0AIABhAC8AVABvAG8AbABzAC8A UwBjAHIAaQBwAHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABl AG0ALwBwAGwAYQB0AGYAbwByAG0AaQBuAGYAbwBfAG0AbwBjAGsALgBwAHkADQAKACsAKwArACAA YgAvAFQAbwBvAGwAcwAvAFMAYwByAGkAcAB0AHMALwB3AGUAYgBrAGkAdABwAHkALwBjAG8AbQBt AG8AbgAvAHMAeQBzAHQAZQBtAC8AcABsAGEAdABmAG8AcgBtAGkAbgBmAG8AXwBtAG8AYwBrAC4A cAB5AA0ACgBAAEAAIAAtADQAOAAsADYAIAArADQAOAAsADkAIABAAEAAIABjAGwAYQBzAHMAIABN AG8AYwBrAFAAbABhAHQAZgBvAHIAbQBJAG4AZgBvACgAbwBiAGoAZQBjAHQAKQA6AA0ACgAgACAA IAAgACAAZABlAGYAIABpAHMAXwB3AGkAbgAoAHMAZQBsAGYAKQA6AA0ACgAgACAAIAAgACAAIAAg ACAAIAByAGUAdAB1AHIAbgAgAHMAZQBsAGYALgBvAHMAXwBuAGEAbQBlACAAPQA9ACAAJwB3AGkA bgAnAA0ACgAgAA0ACgArACAAIAAgACAAZABlAGYAIABpAHMAXwBuAGEAdABpAHYAZQBfAHcAaQBu ACgAcwBlAGwAZgApADoADQAKACsAIAAgACAAIAAgACAAIAAgAHIAZQB0AHUAcgBuACAAcwBlAGwA ZgAuAGkAcwBfAHcAaQBuACgAKQAgAGEAbgBkACAAbgBvAHQAIABzAGUAbABmAC4AaQBzAF8AYwB5 AGcAdwBpAG4AKAApAA0ACgArAA0ACgAgACAAIAAgACAAZABlAGYAIABpAHMAXwBjAHkAZwB3AGkA bgAoAHMAZQBsAGYAKQA6AA0ACgAgACAAIAAgACAAIAAgACAAIAByAGUAdAB1AHIAbgAgAHMAZQBs AGYALgBvAHMAXwBuAGEAbQBlACAAPQA9ACAAJwBjAHkAZwB3AGkAbgAnAA0ACgAgAA0ACgBkAGkA ZgBmACAALQAtAGcAaQB0ACAAYQAvAFQAbwBvAGwAcwAvAFMAYwByAGkAcAB0AHMALwB3AGUAYgBr AGkAdABwAHkALwBjAG8AbQBtAG8AbgAvAHMAeQBzAHQAZQBtAC8AcABsAGEAdABmAG8AcgBtAGkA bgBmAG8AXwB1AG4AaQB0AHQAZQBzAHQALgBwAHkAIABiAC8AVABvAG8AbABzAC8AUwBjAHIAaQBw AHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAGMAbwBtAG0AbwBuAC8AcwB5AHMAdABlAG0ALwBwAGwA YQB0AGYAbwByAG0AaQBuAGYAbwBfAHUAbgBpAHQAdABlAHMAdAAuAHAAeQANAAoAaQBuAGQAZQB4 ACAAYQBkAGMAYQAzADgANwAuAC4AZQA1AGIAZAA1AGQAYwAgADEAMAAwADYANAA0AA0ACgAtAC0A LQAgAGEALwBUAG8AbwBsAHMALwBTAGMAcgBpAHAAdABzAC8AdwBlAGIAawBpAHQAcAB5AC8AYwBv AG0AbQBvAG4ALwBzAHkAcwB0AGUAbQAvAHAAbABhAHQAZgBvAHIAbQBpAG4AZgBvAF8AdQBuAGkA dAB0AGUAcwB0AC4AcAB5AA0ACgArACsAKwAgAGIALwBUAG8AbwBsAHMALwBTAGMAcgBpAHAAdABz AC8AdwBlAGIAawBpAHQAcAB5AC8AYwBvAG0AbQBvAG4ALwBzAHkAcwB0AGUAbQAvAHAAbABhAHQA ZgBvAHIAbQBpAG4AZgBvAF8AdQBuAGkAdAB0AGUAcwB0AC4AcAB5AA0ACgBAAEAAIAAtADEAMQAx ACwANgAgACsAMQAxADEALAA3ACAAQABAACAAYwBsAGEAcwBzACAAVABlAHMAdABQAGwAYQB0AGYA bwByAG0ASQBuAGYAbwAoAHUAbgBpAHQAdABlAHMAdAAuAFQAZQBzAHQAQwBhAHMAZQApADoADQAK ACAAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBhAHMAcwBlAHIAdABGAGEAbABzAGUAKABpAG4A ZgBvAC4AaQBzAF8AbABpAG4AdQB4ACgAKQApAA0ACgAgACAAIAAgACAAIAAgACAAIABzAGUAbABm AC4AYQBzAHMAZQByAHQARgBhAGwAcwBlACgAaQBuAGYAbwAuAGkAcwBfAG0AYQBjACgAKQApAA0A CgAgACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4AYQBzAHMAZQByAHQAVAByAHUAZQAoAGkAbgBm AG8ALgBpAHMAXwB3AGkAbgAoACkAKQANAAoAKwAgACAAIAAgACAAIAAgACAAcwBlAGwAZgAuAGEA cwBzAGUAcgB0AFQAcgB1AGUAKABpAG4AZgBvAC4AaQBzAF8AbgBhAHQAaQB2AGUAXwB3AGkAbgAo ACkAKQANAAoAIAAgACAAIAAgACAAIAAgACAAcwBlAGwAZgAuAGEAcwBzAGUAcgB0AEYAYQBsAHMA ZQAoAGkAbgBmAG8ALgBpAHMAXwBmAHIAZQBlAGIAcwBkACgAKQApAA0ACgAgAA0ACgAgACAAIAAg ACAAIAAgACAAIABpAG4AZgBvACAAPQAgAHMAZQBsAGYALgBtAGEAawBlAF8AaQBuAGYAbwAoAGYA YQBrAGUAXwBzAHkAcwAoACcAYwB5AGcAdwBpAG4AJwApACwAIABlAHgAZQBjAHUAdABpAHYAZQA9 AGYAYQBrAGUAXwBlAHgAZQBjAHUAdABpAHYAZQAoACcANgAuADEALgA3ADYAMAAwACcAKQApAA0A CgBAAEAAIAAtADEAMQA4ACwANgAgACsAMQAxADkALAA3ACAAQABAACAAYwBsAGEAcwBzACAAVABl AHMAdABQAGwAYQB0AGYAbwByAG0ASQBuAGYAbwAoAHUAbgBpAHQAdABlAHMAdAAuAFQAZQBzAHQA QwBhAHMAZQApADoADQAKACAAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBhAHMAcwBlAHIAdABG AGEAbABzAGUAKABpAG4AZgBvAC4AaQBzAF8AbABpAG4AdQB4ACgAKQApAA0ACgAgACAAIAAgACAA IAAgACAAIABzAGUAbABmAC4AYQBzAHMAZQByAHQARgBhAGwAcwBlACgAaQBuAGYAbwAuAGkAcwBf AG0AYQBjACgAKQApAA0ACgAgACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4AYQBzAHMAZQByAHQA VAByAHUAZQAoAGkAbgBmAG8ALgBpAHMAXwB3AGkAbgAoACkAKQANAAoAKwAgACAAIAAgACAAIAAg ACAAcwBlAGwAZgAuAGEAcwBzAGUAcgB0AEYAYQBsAHMAZQAoAGkAbgBmAG8ALgBpAHMAXwBuAGEA dABpAHYAZQBfAHcAaQBuACgAKQApAA0ACgAgACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4AYQBz AHMAZQByAHQARgBhAGwAcwBlACgAaQBuAGYAbwAuAGkAcwBfAGYAcgBlAGUAYgBzAGQAKAApACkA DQAKACAADQAKACAAIAAgACAAIAAgACAAIAAgAGkAbgBmAG8AIAA9ACAAcwBlAGwAZgAuAG0AYQBr AGUAXwBpAG4AZgBvACgAZgBhAGsAZQBfAHMAeQBzACgAJwBmAHIAZQBlAGIAcwBkADgAJwApACkA DQAKAGQAaQBmAGYAIAAtAC0AZwBpAHQAIABhAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAv AHcAZQBiAGsAaQB0AHAAeQAvAHAAbwByAHQALwBzAGUAcgB2AGUAcgBfAHAAcgBvAGMAZQBzAHMA LgBwAHkAIABiAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAv AHAAbwByAHQALwBzAGUAcgB2AGUAcgBfAHAAcgBvAGMAZQBzAHMALgBwAHkADQAKAGkAbgBkAGUA eAAgADIAZAA3ADgAMwBlADcALgAuAGQAMQBiADgAMwAzAGUAIAAxADAAMAA2ADQANAANAAoALQAt AC0AIABhAC8AVABvAG8AbABzAC8AUwBjAHIAaQBwAHQAcwAvAHcAZQBiAGsAaQB0AHAAeQAvAHAA bwByAHQALwBzAGUAcgB2AGUAcgBfAHAAcgBvAGMAZQBzAHMALgBwAHkADQAKACsAKwArACAAYgAv AFQAbwBvAGwAcwAvAFMAYwByAGkAcAB0AHMALwB3AGUAYgBrAGkAdABwAHkALwBwAG8AcgB0AC8A cwBlAHIAdgBlAHIAXwBwAHIAbwBjAGUAcwBzAC4AcAB5AA0ACgBAAEAAIAAtADYANAAsADcAIAAr ADYANAAsADEAMwAgAEAAQAAgAGMAbABhAHMAcwAgAFMAZQByAHYAZQByAFAAcgBvAGMAZQBzAHMA KABvAGIAagBlAGMAdAApADoADQAKACAAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBfAHAAbwBy AHQAIAA9ACAAcABvAHIAdABfAG8AYgBqAA0ACgAgACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4A XwBuAGEAbQBlACAAPQAgAG4AYQBtAGUAIAAgACMAIABTAGgAbwB1AGwAZAAgAGIAZQAgAHQAaABl ACAAYwBvAG0AbQBhAG4AZAAgAG4AYQBtAGUAIAAoAGUALgBnAC4AIABEAHUAbQBwAFIAZQBuAGQA ZQByAFQAcgBlAGUALAAgAEkAbQBhAGcAZQBEAGkAZgBmACkADQAKACAAIAAgACAAIAAgACAAIAAg AHMAZQBsAGYALgBfAGMAbQBkACAAPQAgAGMAbQBkAA0ACgAtACAAIAAgACAAIAAgACAAIABzAGUA bABmAC4AXwBlAG4AdgAgAD0AIABlAG4AdgANAAoAKwANAAoAKwAgACAAIAAgACAAIAAgACAAIwAg AFcAaQBuAGQAbwB3AHMAIABkAG8AZQBzACAAbgBvAHQAIABhAGwAbABvAHcAIAB1AG4AaQBjAG8A ZABlACAAdgBhAGwAdQBlAHMAIABpAG4AIAB0AGgAZQAgAGUAbgB2AGkAcgBvAG4AbQBlAG4AdAAN AAoAKwAgACAAIAAgACAAIAAgACAAaQBmACAAZQBuAHYAIABhAG4AZAAgAHMAZQBsAGYALgBfAHAA bwByAHQALgBoAG8AcwB0AC4AcABsAGEAdABmAG8AcgBtAC4AaQBzAF8AbgBhAHQAaQB2AGUAXwB3 AGkAbgAoACkAOgANAAoAKwAgACAAIAAgACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4AXwBlAG4A dgAgAD0AIAB7AGsAZQB5ADoAIABlAG4AdgBbAGsAZQB5AF0ALgBlAG4AYwBvAGQAZQAoACcAdQB0 AGYALQA4ACcAKQAgAGYAbwByACAAawBlAHkAIABpAG4AIABlAG4AdgB9AA0ACgArACAAIAAgACAA IAAgACAAIABlAGwAcwBlADoADQAKACsAIAAgACAAIAAgACAAIAAgACAAIAAgACAAcwBlAGwAZgAu AF8AZQBuAHYAIAA9ACAAZQBuAHYADQAKACsADQAKACAAIAAgACAAIAAgACAAIAAgACMAIABTAGUA dAAgAGkAZgAgAHQAaABlACAAcAByAG8AYwBlAHMAcwAgAG8AdQB0AHAAdQB0AHMAIABuAG8AbgAt AHMAdABhAG4AZABhAHIAZAAgAG4AZQB3AGwAaQBuAGUAcwAgAGwAaQBrAGUAIAAnAFwAcgBcAG4A JwAgAG8AcgAgACcAXAByACcALgANAAoAIAAgACAAIAAgACAAIAAgACAAIwAgAEQAbwBuACcAdAAg AHMAZQB0ACAAaQBmACAAdABoAGUAcgBlACAAdwBpAGwAbAAgAGIAZQAgAGIAaQBuAGEAcgB5ACAA ZABhAHQAYQAgAG8AcgAgAHQAaABlACAAZABhAHQAYQAgAG0AdQBzAHQAIABiAGUAIABBAFMAQwBJ AEkAIABlAG4AYwBvAGQAZQBkAC4ADQAKACAAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBfAHUA bgBpAHYAZQByAHMAYQBsAF8AbgBlAHcAbABpAG4AZQBzACAAPQAgAHUAbgBpAHYAZQByAHMAYQBs AF8AbgBlAHcAbABpAG4AZQBzAA0ACgBAAEAAIAAtADcANAAsADgAIAArADgAMAAsADcAIABAAEAA IABjAGwAYQBzAHMAIABTAGUAcgB2AGUAcgBQAHIAbwBjAGUAcwBzACgAbwBiAGoAZQBjAHQAKQA6 AA0ACgAgACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4AXwByAGUAcwBlAHQAKAApAA0ACgAgAA0A CgAgACAAIAAgACAAIAAgACAAIAAjACAAUwBlAGUAIABjAG8AbQBtAGUAbgB0ACAAaQBuACAAaQBt AHAAbwByAHQAcwAgAGYAbwByACAAdwBoAHkAIAB3AGUAIABuAGUAZQBkACAAdABoAGUAIAB3AGkA bgAzADIAIABBAFAASQBzACAAYQBuAGQAIABjAGEAbgAnAHQAIABqAHUAcwB0ACAAdQBzAGUAIABz AGUAbABlAGMAdAAuAA0ACgAtACAAIAAgACAAIAAgACAAIAAjACAARgBJAFgATQBFADoAIAB0AGgA ZQByAGUAIABzAGgAbwB1AGwAZAAgAGIAZQAgAGEAIAB3AGEAeQAgAHQAbwAgAGcAZQB0ACAAdwBp AG4AMwAyACAAdgBzAC4AIABjAHkAZwB3AGkAbgAgAGYAcgBvAG0AIABwAGwAYQB0AGYAbwByAG0A aQBuAGYAbwAuAA0ACgAtACAAIAAgACAAIAAgACAAIABzAGUAbABmAC4AXwB1AHMAZQBfAHcAaQBu ADMAMgBfAGEAcABpAHMAIAA9ACAAcwB5AHMALgBwAGwAYQB0AGYAbwByAG0ALgBzAHQAYQByAHQA cwB3AGkAdABoACgAJwB3AGkAbgAnACkADQAKACsAIAAgACAAIAAgACAAIAAgAHMAZQBsAGYALgBf AHUAcwBlAF8AdwBpAG4AMwAyAF8AYQBwAGkAcwAgAD0AIABzAGUAbABmAC4AXwBwAG8AcgB0AC4A aABvAHMAdAAuAHAAbABhAHQAZgBvAHIAbQAuAGkAcwBfAG4AYQB0AGkAdgBlAF8AdwBpAG4AKAAp AA0ACgAgAA0ACgAgACAAIAAgACAAZABlAGYAIABwAGkAZAAoAHMAZQBsAGYAKQA6AA0ACgAgACAA IAAgACAAIAAgACAAIAByAGUAdAB1AHIAbgAgAHMAZQBsAGYALgBfAHAAaQBkAA0ACgA= 326944 2017-11-14 16:42:10 -0800 2017-11-14 16:47:14 -0800 fix CRLF bug-179637.diff text/plain 4536 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxYTg3 NTA5Li5kNGZmODkxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTctMTEtMTQgIEJhc3VrZSBTdXp1a2kgIDxCYXN1 a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBGaXggZXJyb3Igd2hpbGUg bGF1bmNoaW5nIHN1YnByb2Nlc3Mgb24gV2luZG93cyBQeXRob24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTYzNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIHBhc3MgZW52aXJvbm1lbnQgdmFyaWFi bGVzIHRvIHN1YnByb2Nlc3MucG9wZW4gb24gV2luZG93cyBQeXRob24gMiwKKyAgICAgICAgdGhl IGRpY3QgdmFsdWVzIG11c3QgYmUgc3RyIG5vdCB1bmljb2RlLgorICAgICAgICBBbHNvIGlzX25h dGl2ZV93aW4oKSBtZXRob2QgaXMgYWRkZWQgdG8gcG9ydC4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHk6CisgICAgICAgIChQbGF0Zm9y bUluZm8uaXNfbmF0aXZlX3dpbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL3BsYXRmb3JtaW5mb19tb2NrLnB5OgorICAgICAgICAoTW9ja1BsYXRmb3JtSW5mby5p c19uYXRpdmVfd2luKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v cGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFBsYXRmb3JtSW5mby50ZXN0 X29zX25hbWVfYW5kX3dyYXBwZXJzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQv c2VydmVyX3Byb2Nlc3MucHk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9faW5pdF9fKToKKwog MjAxNy0xMS0xNCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAg ICAgd2Via2l0cHk6IFVzZSBtb3JlIHZlcmJvc2UgdmVyc2lvbiBpbmZvIGZyb20gc2ltY3RsCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5m by5weQppbmRleCBmMjYyYTY2Li4wZGFlNGU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKQEAgLTcwLDYgKzcwLDkgQEAg Y2xhc3MgUGxhdGZvcm1JbmZvKG9iamVjdCk6CiAgICAgZGVmIGlzX3dpbihzZWxmKToKICAgICAg ICAgcmV0dXJuIHNlbGYub3NfbmFtZSA9PSAnd2luJwogCisgICAgZGVmIGlzX25hdGl2ZV93aW4o c2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLmlzX3dpbigpIGFuZCBub3Qgc2VsZi5pc19jeWd3 aW4oKQorCiAgICAgZGVmIGlzX2N5Z3dpbihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2lz X2N5Z3dpbgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0 ZW0vcGxhdGZvcm1pbmZvX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vcGxhdGZvcm1pbmZvX21vY2sucHkKaW5kZXggNTViYzA0ZC4uN2I4OGMwYSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb19t b2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm9fbW9jay5weQpAQCAtNDgsNiArNDgsOSBAQCBjbGFzcyBNb2NrUGxhdGZvcm1JbmZvKG9i amVjdCk6CiAgICAgZGVmIGlzX3dpbihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYub3NfbmFt ZSA9PSAnd2luJwogCisgICAgZGVmIGlzX25hdGl2ZV93aW4oc2VsZik6CisgICAgICAgIHJldHVy biBzZWxmLmlzX3dpbigpIGFuZCBub3Qgc2VsZi5pc19jeWd3aW4oKQorCiAgICAgZGVmIGlzX2N5 Z3dpbihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYub3NfbmFtZSA9PSAnY3lnd2luJwogCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Bs YXRmb3JtaW5mb191bml0dGVzdC5weQppbmRleCBhZGNhMzg3Li5lNWJkNWRjIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0 ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm9fdW5pdHRlc3QucHkKQEAgLTExMSw2ICsxMTEsNyBAQCBjbGFzcyBUZXN0UGxhdGZvcm1J bmZvKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShpbmZvLmlz X2xpbnV4KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5pc19tYWMoKSkKICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGluZm8uaXNfd2luKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShpbmZvLmlzX25hdGl2ZV93aW4oKSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShpbmZvLmlz X2ZyZWVic2QoKSkKIAogICAgICAgICBpbmZvID0gc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2N5 Z3dpbicpLCBleGVjdXRpdmU9ZmFrZV9leGVjdXRpdmUoJzYuMS43NjAwJykpCkBAIC0xMTgsNiAr MTE5LDcgQEAgY2xhc3MgVGVzdFBsYXRmb3JtSW5mbyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5pc19saW51eCgpKQogICAgICAgICBzZWxmLmFzc2Vy dEZhbHNlKGluZm8uaXNfbWFjKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpbmZvLmlzX3dp bigpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8uaXNfbmF0aXZlX3dpbigpKQogICAg ICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8uaXNfZnJlZWJzZCgpKQogCiAgICAgICAgIGluZm8g PSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnZnJlZWJzZDgnKSkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQppbmRleCAyZDc4M2U3Li5kMWI4MzNlIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CkBAIC02 NCw3ICs2NCwxMyBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgIHNlbGYu X3BvcnQgPSBwb3J0X29iagogICAgICAgICBzZWxmLl9uYW1lID0gbmFtZSAgIyBTaG91bGQgYmUg dGhlIGNvbW1hbmQgbmFtZSAoZS5nLiBEdW1wUmVuZGVyVHJlZSwgSW1hZ2VEaWZmKQogICAgICAg ICBzZWxmLl9jbWQgPSBjbWQKLSAgICAgICAgc2VsZi5fZW52ID0gZW52CisKKyAgICAgICAgIyBX aW5kb3dzIGRvZXMgbm90IGFsbG93IHVuaWNvZGUgdmFsdWVzIGluIHRoZSBlbnZpcm9ubWVudAor ICAgICAgICBpZiBlbnYgYW5kIHNlbGYuX3BvcnQuaG9zdC5wbGF0Zm9ybS5pc19uYXRpdmVfd2lu KCk6CisgICAgICAgICAgICBzZWxmLl9lbnYgPSB7a2V5OiBlbnZba2V5XS5lbmNvZGUoJ3V0Zi04 JykgZm9yIGtleSBpbiBlbnZ9CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLl9lbnYg PSBlbnYKKwogICAgICAgICAjIFNldCBpZiB0aGUgcHJvY2VzcyBvdXRwdXRzIG5vbi1zdGFuZGFy ZCBuZXdsaW5lcyBsaWtlICdcclxuJyBvciAnXHInLgogICAgICAgICAjIERvbid0IHNldCBpZiB0 aGVyZSB3aWxsIGJlIGJpbmFyeSBkYXRhIG9yIHRoZSBkYXRhIG11c3QgYmUgQVNDSUkgZW5jb2Rl ZC4KICAgICAgICAgc2VsZi5fdW5pdmVyc2FsX25ld2xpbmVzID0gdW5pdmVyc2FsX25ld2xpbmVz CkBAIC03NCw4ICs4MCw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICAgICAg c2VsZi5fcmVzZXQoKQogCiAgICAgICAgICMgU2VlIGNvbW1lbnQgaW4gaW1wb3J0cyBmb3Igd2h5 IHdlIG5lZWQgdGhlIHdpbjMyIEFQSXMgYW5kIGNhbid0IGp1c3QgdXNlIHNlbGVjdC4KLSAgICAg ICAgIyBGSVhNRTogdGhlcmUgc2hvdWxkIGJlIGEgd2F5IHRvIGdldCB3aW4zMiB2cy4gY3lnd2lu IGZyb20gcGxhdGZvcm1pbmZvLgotICAgICAgICBzZWxmLl91c2Vfd2luMzJfYXBpcyA9IHN5cy5w bGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4nKQorICAgICAgICBzZWxmLl91c2Vfd2luMzJfYXBpcyA9 IHNlbGYuX3BvcnQuaG9zdC5wbGF0Zm9ybS5pc19uYXRpdmVfd2luKCkKIAogICAgIGRlZiBwaWQo c2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9waWQK 326946 2017-11-14 16:47:14 -0800 2017-11-14 19:46:16 -0800 remove bug-179637.diff text/plain 4105 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxYTg3 NTA5Li5kNGZmODkxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTctMTEtMTQgIEJhc3VrZSBTdXp1a2kgIDxCYXN1 a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBGaXggZXJyb3Igd2hpbGUg bGF1bmNoaW5nIHN1YnByb2Nlc3Mgb24gV2luZG93cyBQeXRob24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTYzNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIHBhc3MgZW52aXJvbm1lbnQgdmFyaWFi bGVzIHRvIHN1YnByb2Nlc3MucG9wZW4gb24gV2luZG93cyBQeXRob24gMiwKKyAgICAgICAgdGhl IGRpY3QgdmFsdWVzIG11c3QgYmUgc3RyIG5vdCB1bmljb2RlLgorICAgICAgICBBbHNvIGlzX25h dGl2ZV93aW4oKSBtZXRob2QgaXMgYWRkZWQgdG8gcG9ydC4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHk6CisgICAgICAgIChQbGF0Zm9y bUluZm8uaXNfbmF0aXZlX3dpbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL3BsYXRmb3JtaW5mb19tb2NrLnB5OgorICAgICAgICAoTW9ja1BsYXRmb3JtSW5mby5p c19uYXRpdmVfd2luKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v cGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFBsYXRmb3JtSW5mby50ZXN0 X29zX25hbWVfYW5kX3dyYXBwZXJzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQv c2VydmVyX3Byb2Nlc3MucHk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9faW5pdF9fKToKKwog MjAxNy0xMS0xNCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAg ICAgd2Via2l0cHk6IFVzZSBtb3JlIHZlcmJvc2UgdmVyc2lvbiBpbmZvIGZyb20gc2ltY3RsCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5m by5weQppbmRleCBmMjYyYTY2Li4wZGFlNGU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKQEAgLTcwLDYgKzcwLDkgQEAg Y2xhc3MgUGxhdGZvcm1JbmZvKG9iamVjdCk6CiAgICAgZGVmIGlzX3dpbihzZWxmKToKICAgICAg ICAgcmV0dXJuIHNlbGYub3NfbmFtZSA9PSAnd2luJwogCisgICAgZGVmIGlzX25hdGl2ZV93aW4o c2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLmlzX3dpbigpIGFuZCBub3Qgc2VsZi5pc19jeWd3 aW4oKQorCiAgICAgZGVmIGlzX2N5Z3dpbihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2lz X2N5Z3dpbgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0 ZW0vcGxhdGZvcm1pbmZvX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vcGxhdGZvcm1pbmZvX21vY2sucHkKaW5kZXggNTViYzA0ZC4uN2I4OGMwYSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb19t b2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm9fbW9jay5weQpAQCAtNDgsNiArNDgsOSBAQCBjbGFzcyBNb2NrUGxhdGZvcm1JbmZvKG9i amVjdCk6CiAgICAgZGVmIGlzX3dpbihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYub3NfbmFt ZSA9PSAnd2luJwogCisgICAgZGVmIGlzX25hdGl2ZV93aW4oc2VsZik6CisgICAgICAgIHJldHVy biBzZWxmLmlzX3dpbigpIGFuZCBub3Qgc2VsZi5pc19jeWd3aW4oKQorCiAgICAgZGVmIGlzX2N5 Z3dpbihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYub3NfbmFtZSA9PSAnY3lnd2luJwogCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Bs YXRmb3JtaW5mb191bml0dGVzdC5weQppbmRleCBhZGNhMzg3Li5lNWJkNWRjIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0 ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm9fdW5pdHRlc3QucHkKQEAgLTExMSw2ICsxMTEsNyBAQCBjbGFzcyBUZXN0UGxhdGZvcm1J bmZvKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShpbmZvLmlz X2xpbnV4KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5pc19tYWMoKSkKICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGluZm8uaXNfd2luKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShpbmZvLmlzX25hdGl2ZV93aW4oKSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShpbmZvLmlz X2ZyZWVic2QoKSkKIAogICAgICAgICBpbmZvID0gc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2N5 Z3dpbicpLCBleGVjdXRpdmU9ZmFrZV9leGVjdXRpdmUoJzYuMS43NjAwJykpCkBAIC0xMTgsNiAr MTE5LDcgQEAgY2xhc3MgVGVzdFBsYXRmb3JtSW5mbyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5pc19saW51eCgpKQogICAgICAgICBzZWxmLmFzc2Vy dEZhbHNlKGluZm8uaXNfbWFjKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpbmZvLmlzX3dp bigpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8uaXNfbmF0aXZlX3dpbigpKQogICAg ICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8uaXNfZnJlZWJzZCgpKQogCiAgICAgICAgIGluZm8g PSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnZnJlZWJzZDgnKSkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQppbmRleCAyZDc4M2U3Li5kMWI4MzNlIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CkBAIC02 NCw3ICs2NCwxMyBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgIHNlbGYu X3BvcnQgPSBwb3J0X29iagogICAgICAgICBzZWxmLl9uYW1lID0gbmFtZSAgIyBTaG91bGQgYmUg dGhlIGNvbW1hbmQgbmFtZSAoZS5nLiBEdW1wUmVuZGVyVHJlZSwgSW1hZ2VEaWZmKQogICAgICAg ICBzZWxmLl9jbWQgPSBjbWQKLSAgICAgICAgc2VsZi5fZW52ID0gZW52CisKKyAgICAgICAgIyBX aW5kb3dzIGRvZXMgbm90IGFsbG93IHVuaWNvZGUgdmFsdWVzIGluIHRoZSBlbnZpcm9ubWVudAor ICAgICAgICBpZiBlbnYgYW5kIHNlbGYuX3BvcnQuaG9zdC5wbGF0Zm9ybS5pc19uYXRpdmVfd2lu KCk6CisgICAgICAgICAgICBzZWxmLl9lbnYgPSB7a2V5OiBlbnZba2V5XS5lbmNvZGUoJ3V0Zi04 JykgZm9yIGtleSBpbiBlbnZ9CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLl9lbnYg PSBlbnYKKwogICAgICAgICAjIFNldCBpZiB0aGUgcHJvY2VzcyBvdXRwdXRzIG5vbi1zdGFuZGFy ZCBuZXdsaW5lcyBsaWtlICdcclxuJyBvciAnXHInLgogICAgICAgICAjIERvbid0IHNldCBpZiB0 aGVyZSB3aWxsIGJlIGJpbmFyeSBkYXRhIG9yIHRoZSBkYXRhIG11c3QgYmUgQVNDSUkgZW5jb2Rl ZC4KICAgICAgICAgc2VsZi5fdW5pdmVyc2FsX25ld2xpbmVzID0gdW5pdmVyc2FsX25ld2xpbmVz Cg==