27528 2009-07-21 22:29:25 -0700 run-webkit-lint should have --git-commit option 2009-07-22 15:11:16 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hamaji levin levin oldest_to_newest 133697 0 hamaji 2009-07-21 22:29:25 -0700 We would want to check style for local git commits. 133698 1 33240 hamaji 2009-07-21 22:30:50 -0700 Created attachment 33240 Patch v1 --- 3 files changed, 35 insertions(+), 7 deletions(-) 133699 2 33240 hamaji 2009-07-21 22:34:48 -0700 Comment on attachment 33240 Patch v1 Oops. This breaks cpplint_unittest due to lack of default argument of additional_flags. I'll modify a bit. 133700 3 33241 hamaji 2009-07-21 22:45:21 -0700 Created attachment 33241 Patch v2 --- 4 files changed, 56 insertions(+), 18 deletions(-) 133712 4 33241 levin 2009-07-21 23:36:00 -0700 Comment on attachment 33241 Patch v2 > diff --git a/WebKitTools/Scripts/run-webkit-lint b/WebKitTools/Scripts/run-webkit-lint > @@ -57,6 +57,13 @@ Syntax: %(program_name)s [--verbose=#] [--output=vs7] [--filter=-x,+y,...] Shouldn't the "Syntax" line get [--git-commit=<COMMITISH>] added to it? 133779 5 33241 levin 2009-07-22 09:11:25 -0700 Comment on attachment 33241 Patch v2 I'll fix the small issue that I noted above while landing. 133900 6 levin 2009-07-22 14:23:58 -0700 Assign to levin for landing. 133935 7 levin 2009-07-22 15:11:16 -0700 Committed as http://trac.webkit.org/changeset/46242 33240 2009-07-21 22:30:50 -0700 2009-07-21 22:34:48 -0700 Patch v1 bug-27528-20090722143048.patch text/plain 3788 hamaji ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNmVhZTc0Li4zZDlmMTNjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDct MjEgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBydW4td2Via2l0LWxpbnQgc2hv dWxkIGhhdmUgLS1naXQtY29tbWl0IG9wdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1MjgKKworICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9j cHBsaW50LnB5OgorICAgICAgICAqIFNjcmlwdHMvcnVuLXdlYmtpdC1saW50OgorCiAyMDA5LTA3 LTIxICBBZGFtIFRyZWF0ICA8YWRhbS50cmVhdEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY3BwbGludC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50 LnB5Cm9sZCBtb2RlIDEwMDY0NApuZXcgbW9kZSAxMDA3NTUKaW5kZXggNDY3ZjBjMy4uMDBkOGEx OAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weQpAQCAtMjg3NSwyMCArMjg3NSwyNSBA QCBkZWYgcHJpbnRfY2F0ZWdvcmllcygpOgogICAgIHN5cy5leGl0KDApCiAKIAotZGVmIHBhcnNl X2FyZ3VtZW50cyhhcmdzKToKK2RlZiBwYXJzZV9hcmd1bWVudHMoYXJncywgYWRkaXRpb25hbF9m bGFncyk6CiAgICAgIiIiUGFyc2VzIHRoZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzLgogCiAgICAg VGhpcyBtYXkgc2V0IHRoZSBvdXRwdXQgZm9ybWF0IGFuZCB2ZXJib3NpdHkgbGV2ZWwgYXMgc2lk ZS1lZmZlY3RzLgogCiAgICAgQXJnczoKICAgICAgIGFyZ3M6IFRoZSBjb21tYW5kIGxpbmUgYXJn dW1lbnRzOgorICAgICAgYWRkaXRpb25hbF9mbGFnczogQSBsaXN0IG9mIHN0cmluZ3Mgd2hpY2gg c3BlY2lmaWVzIGZsYWdzIHdlIGFsbG93LgogCiAgICAgUmV0dXJuczoKLSAgICAgIFRoZSBsaXN0 IG9mIGZpbGVuYW1lcyB0byBsaW50LgorICAgICAgQSB0dXBsZSBvZiAoZmlsZW5hbWVzLCBmbGFn cykKKworICAgICAgZmlsZW5hbWVzOiBUaGUgbGlzdCBvZiBmaWxlbmFtZXMgdG8gbGludC4KKyAg ICAgIGZsYWdzOiBUaGUgZGljdCBvZiB0aGUgZmxhZyBuYW1lcyBhbmQgdGhlIGZsYWcgdmFsdWVz LgogICAgICIiIgorICAgIGZsYWdzID0gWydoZWxwJywgJ291dHB1dD0nLCAndmVyYm9zZT0nLCAn ZmlsdGVyPSddICsgYWRkaXRpb25hbF9mbGFncworICAgIGFkZGl0aW9uYWxfZmxhZ192YWx1ZXMg PSB7fQogICAgIHRyeToKLSAgICAgICAgKG9wdHMsIGZpbGVuYW1lcykgPSBnZXRvcHQuZ2V0b3B0 KGFyZ3MsICcnLCBbJ2hlbHAnLCAnb3V0cHV0PScsICd2ZXJib3NlPScsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdmaWx0ZXI9J10pCisgICAg ICAgIChvcHRzLCBmaWxlbmFtZXMpID0gZ2V0b3B0LmdldG9wdChhcmdzLCAnJywgZmxhZ3MpCiAg ICAgZXhjZXB0IGdldG9wdC5HZXRvcHRFcnJvcjoKICAgICAgICAgcHJpbnRfdXNhZ2UoJ0ludmFs aWQgYXJndW1lbnRzLicpCiAKQEAgLTI5MDksMTIgKzI5MTQsMTQgQEAgZGVmIHBhcnNlX2FyZ3Vt ZW50cyhhcmdzKToKICAgICAgICAgICAgIGZpbHRlcnMgPSB2YWwKICAgICAgICAgICAgIGlmIG5v dCBmaWx0ZXJzOgogICAgICAgICAgICAgICAgIHByaW50X2NhdGVnb3JpZXMoKQorICAgICAgICBl bHNlOgorICAgICAgICAgICAgYWRkaXRpb25hbF9mbGFnX3ZhbHVlc1tvcHRdID0gdmFsCiAKICAg ICBfc2V0X291dHB1dF9mb3JtYXQob3V0cHV0X2Zvcm1hdCkKICAgICBfc2V0X3ZlcmJvc2VfbGV2 ZWwodmVyYm9zaXR5KQogICAgIF9zZXRfZmlsdGVycyhmaWx0ZXJzKQogCi0gICAgcmV0dXJuIGZp bGVuYW1lcworICAgIHJldHVybiAoZmlsZW5hbWVzLCBhZGRpdGlvbmFsX2ZsYWdfdmFsdWVzKQog CiAKIGRlZiB1c2Vfd2Via2l0X3N0eWxlcygpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy9ydW4td2Via2l0LWxpbnQgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtbGlu dAppbmRleCBiZWIyNDk3Li4yYjI1ZmM5IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3J1bi13ZWJraXQtbGludAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtbGlu dApAQCAtNTcsNiArNTcsMTMgQEAgU3ludGF4OiAlKHByb2dyYW1fbmFtZSlzIFstLXZlcmJvc2U9 I10gWy0tb3V0cHV0PXZzN10gWy0tZmlsdGVyPS14LCt5LC4uLl0KIAogICBGbGFnczoKIAorICAg IGdpdC1jb21taXQ9PENPTU1JVElTSD4KKyAgICAgIENoZWNrIHN0eWxlIGZvciBhIHNwZWNpZmll ZCBnaXQgY29tbWl0LgorICAgICAgTm90ZSB0aGF0IHRoZSBwcm9ncmFtIGNoZWNrcyBzdHlsZSBi YXNlZCBvbiBjdXJyZW50IGxvY2FsIGZpbGUKKyAgICAgIGluc3RlYWQgb2YgYWN0dWFsIGRpZmYg b2YgdGhlIGdpdCBjb21taXQuICBTbywgaWYgdGhlIGZpbGVzIGFyZQorICAgICAgdXBkYXRlZCBh ZnRlciB0aGUgc3BlY2lmaWVkIGdpdCBjb21taXQsIHRoZSBpbmZvcm1hdGlvbiBvZiBsaW5lCisg ICAgICBudW1iZXIgbWF5IGJlIHdyb25nLgorCiAgICAgb3V0cHV0PXZzNwogICAgICAgQnkgZGVm YXVsdCwgdGhlIG91dHB1dCBpcyBmb3JtYXR0ZWQgdG8gZWFzZSBlbWFjcyBwYXJzaW5nLiAgVmlz dWFsIFN0dWRpbwogICAgICAgY29tcGF0aWJsZSBvdXRwdXQgKHZzNykgbWF5IGFsc28gYmUgdXNl ZC4gIE90aGVyIGZvcm1hdHMgYXJlIHVuc3VwcG9ydGVkLgpAQCAtMTEyLDcgKzExOSw4IEBAIGRl ZiBwcm9jZXNzX3BhdGNoKHBhdGNoX3N0cmluZyk6CiAKIGRlZiBtYWluKCk6CiAgICAgY3BwbGlu dC51c2Vfd2Via2l0X3N0eWxlcygpCi0gICAgYXJncyA9IGNwcGxpbnQucGFyc2VfYXJndW1lbnRz KHN5cy5hcmd2WzE6XSkKKworICAgIChhcmdzLCBmbGFncykgPSBjcHBsaW50LnBhcnNlX2FyZ3Vt ZW50cyhzeXMuYXJndlsxOl0sIFsiZ2l0LWNvbW1pdD0iXSkKICAgICBpZiBhcmdzOgogICAgICAg ICBzeXMuc3RkZXJyLndyaXRlKCJFUlJPUjogV2UgZG9uJ3Qgc3VwcG9ydCBmaWxlcyBhcyBhcmd1 bWVudHMgZm9yIG5vdy5cbiIgKyBjcHBsaW50Ll9VU0FHRSkKICAgICAgICAgc3lzLmV4aXQoMSkK QEAgLTEyMCw3ICsxMjgsMTAgQEAgZGVmIG1haW4oKToKICAgICBjd2QgPSBvcy5wYXRoLmFic3Bh dGgoJy4nKQogICAgIHNjbSA9IGRldGVjdF9zY21fc3lzdGVtKGN3ZCkKIAotICAgIHByb2Nlc3Nf cGF0Y2goc2NtLmNyZWF0ZV9wYXRjaCgpKQorICAgIGlmICItLWdpdC1jb21taXQiIGluIGZsYWdz OgorICAgICAgICBwcm9jZXNzX3BhdGNoKHNjbS5jcmVhdGVfcGF0Y2hfZnJvbV9sb2NhbF9jb21t aXQoZmxhZ3NbIi0tZ2l0LWNvbW1pdCJdKSkKKyAgICBlbHNlOgorICAgICAgICBwcm9jZXNzX3Bh dGNoKHNjbS5jcmVhdGVfcGF0Y2goKSkKIAogICAgIHN5cy5zdGRlcnIud3JpdGUoJ1RvdGFsIGVy cm9ycyBmb3VuZDogJWRcbicgJSBjcHBsaW50LmVycm9yX2NvdW50KCkpCiAgICAgc3lzLmV4aXQo Y3BwbGludC5lcnJvcl9jb3VudCgpID4gMCk= 33241 2009-07-21 22:45:21 -0700 2009-07-22 09:11:25 -0700 Patch v2 bug-27528-20090722144520.patch text/plain 7908 hamaji ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNmVhZTc0Li4zZDlmMTNjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDct MjEgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBydW4td2Via2l0LWxpbnQgc2hv dWxkIGhhdmUgLS1naXQtY29tbWl0IG9wdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1MjgKKworICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9j cHBsaW50LnB5OgorICAgICAgICAqIFNjcmlwdHMvcnVuLXdlYmtpdC1saW50OgorCiAyMDA5LTA3 LTIxICBBZGFtIFRyZWF0ICA8YWRhbS50cmVhdEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY3BwbGludC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50 LnB5Cm9sZCBtb2RlIDEwMDY0NApuZXcgbW9kZSAxMDA3NTUKaW5kZXggNDY3ZjBjMy4uNjZkN2I4 YwotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weQpAQCAtMjg3NSwyMCArMjg3NSwyNSBA QCBkZWYgcHJpbnRfY2F0ZWdvcmllcygpOgogICAgIHN5cy5leGl0KDApCiAKIAotZGVmIHBhcnNl X2FyZ3VtZW50cyhhcmdzKToKK2RlZiBwYXJzZV9hcmd1bWVudHMoYXJncywgYWRkaXRpb25hbF9m bGFncz1bXSk6CiAgICAgIiIiUGFyc2VzIHRoZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzLgogCiAg ICAgVGhpcyBtYXkgc2V0IHRoZSBvdXRwdXQgZm9ybWF0IGFuZCB2ZXJib3NpdHkgbGV2ZWwgYXMg c2lkZS1lZmZlY3RzLgogCiAgICAgQXJnczoKICAgICAgIGFyZ3M6IFRoZSBjb21tYW5kIGxpbmUg YXJndW1lbnRzOgorICAgICAgYWRkaXRpb25hbF9mbGFnczogQSBsaXN0IG9mIHN0cmluZ3Mgd2hp Y2ggc3BlY2lmaWVzIGZsYWdzIHdlIGFsbG93LgogCiAgICAgUmV0dXJuczoKLSAgICAgIFRoZSBs aXN0IG9mIGZpbGVuYW1lcyB0byBsaW50LgorICAgICAgQSB0dXBsZSBvZiAoZmlsZW5hbWVzLCBm bGFncykKKworICAgICAgZmlsZW5hbWVzOiBUaGUgbGlzdCBvZiBmaWxlbmFtZXMgdG8gbGludC4K KyAgICAgIGZsYWdzOiBUaGUgZGljdCBvZiB0aGUgZmxhZyBuYW1lcyBhbmQgdGhlIGZsYWcgdmFs dWVzLgogICAgICIiIgorICAgIGZsYWdzID0gWydoZWxwJywgJ291dHB1dD0nLCAndmVyYm9zZT0n LCAnZmlsdGVyPSddICsgYWRkaXRpb25hbF9mbGFncworICAgIGFkZGl0aW9uYWxfZmxhZ192YWx1 ZXMgPSB7fQogICAgIHRyeToKLSAgICAgICAgKG9wdHMsIGZpbGVuYW1lcykgPSBnZXRvcHQuZ2V0 b3B0KGFyZ3MsICcnLCBbJ2hlbHAnLCAnb3V0cHV0PScsICd2ZXJib3NlPScsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdmaWx0ZXI9J10pCisg ICAgICAgIChvcHRzLCBmaWxlbmFtZXMpID0gZ2V0b3B0LmdldG9wdChhcmdzLCAnJywgZmxhZ3Mp CiAgICAgZXhjZXB0IGdldG9wdC5HZXRvcHRFcnJvcjoKICAgICAgICAgcHJpbnRfdXNhZ2UoJ0lu dmFsaWQgYXJndW1lbnRzLicpCiAKQEAgLTI5MDksMTIgKzI5MTQsMTQgQEAgZGVmIHBhcnNlX2Fy Z3VtZW50cyhhcmdzKToKICAgICAgICAgICAgIGZpbHRlcnMgPSB2YWwKICAgICAgICAgICAgIGlm IG5vdCBmaWx0ZXJzOgogICAgICAgICAgICAgICAgIHByaW50X2NhdGVnb3JpZXMoKQorICAgICAg ICBlbHNlOgorICAgICAgICAgICAgYWRkaXRpb25hbF9mbGFnX3ZhbHVlc1tvcHRdID0gdmFsCiAK ICAgICBfc2V0X291dHB1dF9mb3JtYXQob3V0cHV0X2Zvcm1hdCkKICAgICBfc2V0X3ZlcmJvc2Vf bGV2ZWwodmVyYm9zaXR5KQogICAgIF9zZXRfZmlsdGVycyhmaWx0ZXJzKQogCi0gICAgcmV0dXJu IGZpbGVuYW1lcworICAgIHJldHVybiAoZmlsZW5hbWVzLCBhZGRpdGlvbmFsX2ZsYWdfdmFsdWVz KQogCiAKIGRlZiB1c2Vfd2Via2l0X3N0eWxlcygpOgpAQCAtMjk2Miw3ICsyOTY5LDcgQEAgdGhh dCB5b3Ugbm90aWNlIHRoYXQgaXQgZmxhZ3MgaW5jb3JyZWN0bHkuCiAKICAgICB1c2Vfd2Via2l0 X3N0eWxlcygpCiAKLSAgICBmaWxlbmFtZXMgPSBwYXJzZV9hcmd1bWVudHMoc3lzLmFyZ3ZbMTpd KQorICAgIChmaWxlbmFtZXMsIGZsYWdzKSA9IHBhcnNlX2FyZ3VtZW50cyhzeXMuYXJndlsxOl0p CiAgICAgaWYgbm90IGZpbGVuYW1lczoKICAgICAgICAgcHJpbnRfdXNhZ2UoJ05vIGZpbGVzIHdl cmUgc3BlY2lmaWVkLicpCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9jcHBsaW50X3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxp bnRfdW5pdHRlc3QucHkKb2xkIG1vZGUgMTAwNjQ0Cm5ldyBtb2RlIDEwMDc1NQppbmRleCA2ZmQ2 OGU2Li5jMGRlYWIzCi0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50X3Vu aXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50X3VuaXR0 ZXN0LnB5CkBAIC0xNDk0LDQyICsxNDk0LDUyIEBAIGNsYXNzIENwcGxpbnRUZXN0KENwcGxpbnRU ZXN0QmFzZSk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhWYWx1ZUVycm9yLCBjcHBs aW50LnBhcnNlX2FyZ3VtZW50cywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFsnLS1m aWx0ZXI9K2EsYiwtYyddKQogCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhbJ2Zvby5j YyddLCBjcHBsaW50LnBhcnNlX2FyZ3VtZW50cyhbJ2Zvby5jYyddKSkKKyAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKChbJ2Zvby5jYyddLCB7fSksIGNwcGxpbnQucGFyc2VfYXJndW1lbnRz KFsnZm9vLmNjJ10pKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMob2xkX291dHB1dF9m b3JtYXQsIGNwcGxpbnQuX2NwcGxpbnRfc3RhdGUub3V0cHV0X2Zvcm1hdCkKICAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKG9sZF92ZXJib3NlX2xldmVsLCBjcHBsaW50Ll9jcHBsaW50X3N0 YXRlLnZlcmJvc2VfbGV2ZWwpCiAKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFtdLCBj cHBsaW50LnBhcnNlX2FyZ3VtZW50cyhbXSkpCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhbXSwgY3BwbGludC5wYXJzZV9hcmd1bWVudHMoWyctLXY9MCddKSkKKyAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKChbXSwge30pLCBjcHBsaW50LnBhcnNlX2FyZ3VtZW50cyhbXSkpCisg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscygoW10sIHt9KSwgY3BwbGludC5wYXJzZV9hcmd1 bWVudHMoWyctLXY9MCddKSkKIAotICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoWydmb28u Y2MnXSwKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKChbJ2Zvby5jYyddLCB7fSksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjcHBsaW50LnBhcnNlX2FyZ3VtZW50cyhbJy0t dj0xJywgJ2Zvby5jYyddKSkKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDEsIGNwcGxp bnQuX2NwcGxpbnRfc3RhdGUudmVyYm9zZV9sZXZlbCkKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKFsnZm9vLmgnXSwKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKChbJ2Zvby5o J10sIHt9KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNwcGxpbnQucGFyc2VfYXJn dW1lbnRzKFsnLS12PTMnLCAnZm9vLmgnXSkpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs cygzLCBjcHBsaW50Ll9jcHBsaW50X3N0YXRlLnZlcmJvc2VfbGV2ZWwpCi0gICAgICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhbJ2Zvby5jcHAnXSwKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKChbJ2Zvby5jcHAnXSwge30pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Bw bGludC5wYXJzZV9hcmd1bWVudHMoWyctLXZlcmJvc2U9NScsICdmb28uY3BwJ10pKQogICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoNSwgY3BwbGludC5fY3BwbGludF9zdGF0ZS52ZXJib3Nl X2xldmVsKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNwcGxpbnQucGFyc2VfYXJndW1lbnRzLCBbJy0tdj1m JywgJ2Zvby5jYyddKQogCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhbJ2Zvby5jYydd LAorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoKFsnZm9vLmNjJ10sIHt9KSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNwcGxpbnQucGFyc2VfYXJndW1lbnRzKFsnLS1vdXRw dXQ9ZW1hY3MnLCAnZm9vLmNjJ10pKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoJ2Vt YWNzJywgY3BwbGludC5fY3BwbGludF9zdGF0ZS5vdXRwdXRfZm9ybWF0KQotICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoWydmb28uaCddLAorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoKFsnZm9vLmgnXSwge30pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3BwbGlu dC5wYXJzZV9hcmd1bWVudHMoWyctLW91dHB1dD12czcnLCAnZm9vLmgnXSkpCiAgICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFscygndnM3JywgY3BwbGludC5fY3BwbGludF9zdGF0ZS5vdXRwdXRf Zm9ybWF0KQogICAgICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU3lzdGVtRXhpdCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNwcGxpbnQucGFyc2VfYXJndW1lbnRzLCBbJy0tb3V0 cHV0PWJsYWgnLCAnZm9vLmNjJ10pCiAKICAgICAgICAgICAgIGZpbHQgPSAnLSwrd2hpdGVzcGFj ZSwtd2hpdGVzcGFjZS9pbmRlbnQnCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhbJ2Zv by5oJ10sCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscygoWydmb28uaCddLCB7fSksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjcHBsaW50LnBhcnNlX2FyZ3VtZW50cyhbJy0t ZmlsdGVyPScrZmlsdCwgJ2Zvby5oJ10pKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo WyctJywgJyt3aGl0ZXNwYWNlJywgJy13aGl0ZXNwYWNlL2luZGVudCddLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY3BwbGludC5fY3BwbGludF9zdGF0ZS5maWx0ZXJzKQogCi0gICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhbJ2Zvby5jYycsICdmb28uaCddLAorICAgICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoKFsnZm9vLmNjJywgJ2Zvby5oJ10sIHt9KSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNwcGxpbnQucGFyc2VfYXJndW1lbnRzKFsnZm9vLmNjJywg J2Zvby5oJ10pKQorCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscygoWydmb28uY2MnXSwg eyctLWZvbyc6ICcnfSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjcHBsaW50LnBh cnNlX2FyZ3VtZW50cyhbJy0tZm9vJywgJ2Zvby5jYyddLCBbJ2ZvbyddKSkKKyAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKChbJ2Zvby5jYyddLCB7Jy0tZm9vJzogJ2Jhcid9KSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNwcGxpbnQucGFyc2VfYXJndW1lbnRzKFsnLS1mb289 YmFyJywgJ2Zvby5jYyddLCBbJ2Zvbz0nXSkpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs cygoWydmb28uY2MnXSwge30pLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3BwbGlu dC5wYXJzZV9hcmd1bWVudHMoWydmb28uY2MnXSwgWydmb289J10pKQorICAgICAgICAgICAgc2Vs Zi5hc3NlcnRSYWlzZXMoU3lzdGVtRXhpdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNwcGxpbnQucGFyc2VfYXJndW1lbnRzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg WyctLWZvb3R5cG89YmFyJywgJ2Zvby5jYyddLCBbJ2Zvbz0nXSkKICAgICAgICAgZmluYWxseToK ICAgICAgICAgICAgIGNwcGxpbnQuX1VTQUdFID0gb2xkX3VzYWdlCiAgICAgICAgICAgICBjcHBs aW50Ll9FUlJPUl9DQVRFR09SSUVTID0gb2xkX2Vycm9yX2NhdGVnb3JpZXMKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC1saW50IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9ydW4td2Via2l0LWxpbnQKaW5kZXggYmViMjQ5Ny4uMmIyNWZjOSAxMDA3NTUKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LWxpbnQKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9ydW4td2Via2l0LWxpbnQKQEAgLTU3LDYgKzU3LDEzIEBAIFN5bnRheDogJShwcm9ncmFtX25h bWUpcyBbLS12ZXJib3NlPSNdIFstLW91dHB1dD12czddIFstLWZpbHRlcj0teCwreSwuLi5dCiAK ICAgRmxhZ3M6CiAKKyAgICBnaXQtY29tbWl0PTxDT01NSVRJU0g+CisgICAgICBDaGVjayBzdHls ZSBmb3IgYSBzcGVjaWZpZWQgZ2l0IGNvbW1pdC4KKyAgICAgIE5vdGUgdGhhdCB0aGUgcHJvZ3Jh bSBjaGVja3Mgc3R5bGUgYmFzZWQgb24gY3VycmVudCBsb2NhbCBmaWxlCisgICAgICBpbnN0ZWFk IG9mIGFjdHVhbCBkaWZmIG9mIHRoZSBnaXQgY29tbWl0LiAgU28sIGlmIHRoZSBmaWxlcyBhcmUK KyAgICAgIHVwZGF0ZWQgYWZ0ZXIgdGhlIHNwZWNpZmllZCBnaXQgY29tbWl0LCB0aGUgaW5mb3Jt YXRpb24gb2YgbGluZQorICAgICAgbnVtYmVyIG1heSBiZSB3cm9uZy4KKwogICAgIG91dHB1dD12 czcKICAgICAgIEJ5IGRlZmF1bHQsIHRoZSBvdXRwdXQgaXMgZm9ybWF0dGVkIHRvIGVhc2UgZW1h Y3MgcGFyc2luZy4gIFZpc3VhbCBTdHVkaW8KICAgICAgIGNvbXBhdGlibGUgb3V0cHV0ICh2czcp IG1heSBhbHNvIGJlIHVzZWQuICBPdGhlciBmb3JtYXRzIGFyZSB1bnN1cHBvcnRlZC4KQEAgLTEx Miw3ICsxMTksOCBAQCBkZWYgcHJvY2Vzc19wYXRjaChwYXRjaF9zdHJpbmcpOgogCiBkZWYgbWFp bigpOgogICAgIGNwcGxpbnQudXNlX3dlYmtpdF9zdHlsZXMoKQotICAgIGFyZ3MgPSBjcHBsaW50 LnBhcnNlX2FyZ3VtZW50cyhzeXMuYXJndlsxOl0pCisKKyAgICAoYXJncywgZmxhZ3MpID0gY3Bw bGludC5wYXJzZV9hcmd1bWVudHMoc3lzLmFyZ3ZbMTpdLCBbImdpdC1jb21taXQ9Il0pCiAgICAg aWYgYXJnczoKICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRVJST1I6IFdlIGRvbid0IHN1cHBv cnQgZmlsZXMgYXMgYXJndW1lbnRzIGZvciBub3cuXG4iICsgY3BwbGludC5fVVNBR0UpCiAgICAg ICAgIHN5cy5leGl0KDEpCkBAIC0xMjAsNyArMTI4LDEwIEBAIGRlZiBtYWluKCk6CiAgICAgY3dk ID0gb3MucGF0aC5hYnNwYXRoKCcuJykKICAgICBzY20gPSBkZXRlY3Rfc2NtX3N5c3RlbShjd2Qp CiAKLSAgICBwcm9jZXNzX3BhdGNoKHNjbS5jcmVhdGVfcGF0Y2goKSkKKyAgICBpZiAiLS1naXQt Y29tbWl0IiBpbiBmbGFnczoKKyAgICAgICAgcHJvY2Vzc19wYXRjaChzY20uY3JlYXRlX3BhdGNo X2Zyb21fbG9jYWxfY29tbWl0KGZsYWdzWyItLWdpdC1jb21taXQiXSkpCisgICAgZWxzZToKKyAg ICAgICAgcHJvY2Vzc19wYXRjaChzY20uY3JlYXRlX3BhdGNoKCkpCiAKICAgICBzeXMuc3RkZXJy LndyaXRlKCdUb3RhbCBlcnJvcnMgZm91bmQ6ICVkXG4nICUgY3BwbGludC5lcnJvcl9jb3VudCgp KQogICAgIHN5cy5leGl0KGNwcGxpbnQuZXJyb3JfY291bnQoKSA+IDAp