27908 2009-07-31 18:44:39 -0700 check-webkit-style --git-commit has bugs if you select a commit in the past 2009-07-31 19:36:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 levin levin ddkilzer eric manyoso oldest_to_newest 136336 0 levin 2009-07-31 18:44:39 -0700 check-wekbit-style uses the diff on the single commit to get the lines changes so it can filter error messages. The problem is that the lines changed in the commit may have moved since the commit was done, so the filtering is incorrect. This fix is uses the commit given as the starting point and the current directory state as the ending point. 136338 1 33919 levin 2009-07-31 18:56:56 -0700 Created attachment 33919 Proposed fix. 136340 2 33919 manyoso 2009-07-31 19:07:13 -0700 Comment on attachment 33919 Proposed fix. > + commitish = flags["--git-commit"] > + if commitish.find('..'): > + # FIXME: If the range is a "...", the code should find the common ancesto, > + # do the diff from there. Not sure I understand this FIXME. And you mean 'ancestoR', right? 136343 3 33921 levin 2009-07-31 19:22:28 -0700 Created attachment 33921 Proposed fix. Addressed some coding issues mention by Eric. Fixed the spelling issue and tried to clarify the issue mentioned by Adam. 136349 4 levin 2009-07-31 19:36:56 -0700 http://trac.webkit.org/changeset/46652 33919 2009-07-31 18:56:56 -0700 2009-07-31 19:22:28 -0700 Proposed fix. bug27908.txt text/plain 4439 levin ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2MTVkMGM1Li4yYTVlNGE1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMDct MzEgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZSAtLWdpdC1j b21taXQgaGFzIGJ1Z3MgaWYgeW91IHNlbGVjdCBhIGNvbW1pdCBpbiB0aGUgcGFzdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc5MDgKKworICAgICAg ICAqIFNjcmlwdHMvY2hlY2std2Via2l0LXN0eWxlOgorICAgICAgICAobWFpbik6IE1hZGUgdGhl IGdpdC1jb21taXQgY29tbWFuZCBvbmx5IHNlbGVjdCB0aGUgZmlyc3QgY29tbWl0CisgICAgICAg IGlmIGEgcmFuZ2UgaXMgZ2l2ZW4gKGFuZCBwcmludCBhIHdhcm5pbmcpLgorICAgICAgICAqIFNj cmlwdHMvbW9kdWxlcy9zY20ucHk6CisgICAgICAgIChTQ006OmNyZWF0ZV9wYXRjaF9mcm9tX2xv Y2FsX2NvbW1pdCk6CisgICAgICAgIChTQ006OmNyZWF0ZV9wYXRjaF9zaW5jZV9sb2NhbF9jb21t aXQpOgorICAgICAgICAoU0NNOjpjb21taXRfbG9jYWxseV93aXRoX21lc3NhZ2UpOgorICAgICAg ICAoU0NNOjpkaXNjYXJkX2xvY2FsX2NvbW1pdHMpOgorICAgICAgICBBZGRlZCBhbiBlcnJvciBt ZXNzYWdlcyBpbiBjYXNlIHRoZXNlIGFyZW4ndCBvdmVycmlkZW4uCisKKyAgICAgICAgKEdpdDo6 Y3JlYXRlX3BhdGNoX3NpbmNlX2xvY2FsX2NvbW1pdCk6CisgICAgICAgIEFkZGVkIHRoaXMgY29t bWFuZCB0byBhbGxvdyBkb2luZyBhIGRpZmYgb2YgZXZlcnl0aGluZyBhZnRlciBhIGdpdmVuIGNv bW1pdC4KKwogMjAwOS0wNy0zMCAgTWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBhIFF0IExpbnV4IGJ1aWxkIGJvdC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvY2hlY2std2Via2l0LXN0eWxlIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVjay13ZWJr aXQtc3R5bGUKaW5kZXggOWU2YzI0Zi4uYjA0NDk1ZSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVj ay13ZWJraXQtc3R5bGUKQEAgLTQyLDcgKzQyLDcgQEAgZnJvbSBtb2R1bGVzLnNjbSBpbXBvcnQg ZGV0ZWN0X3NjbV9zeXN0ZW0KIAogIyBPdmVycmlkZSB0aGUgdXNhZ2Ugb2YgdGhlIGxpbnQgdG9v bC4KIGNwcF9zdHlsZS5fVVNBR0UgPSAiIiIKLVN5bnRheDogJShwcm9ncmFtX25hbWUpcyBbLS12 ZXJib3NlPSNdIFstLWdpdC1jb21taXQ9PENPTU1JVElTSD5dIFstLW91dHB1dD12czddCitTeW50 YXg6ICUocHJvZ3JhbV9uYW1lKXMgWy0tdmVyYm9zZT0jXSBbLS1naXQtY29tbWl0PTxTaW5nbGVD b21taXQ+XSBbLS1vdXRwdXQ9dnM3XQogICAgICAgICBbLS1maWx0ZXI9LXgsK3ksLi4uXSBbZmls ZV0gLi4uCiAKICAgVGhlIHN0eWxlIGd1aWRlbGluZXMgdGhpcyB0cmllcyB0byBmb2xsb3cgYXJl IHRob3NlIGluCkBAIC02NiwxMiArNjYsOCBAQCBTeW50YXg6ICUocHJvZ3JhbV9uYW1lKXMgWy0t dmVyYm9zZT0jXSBbLS1naXQtY29tbWl0PTxDT01NSVRJU0g+XSBbLS1vdXRwdXQ9dnM3XQogICAg IHZlcmJvc2U9IwogICAgICAgU3BlY2lmeSBhIG51bWJlciAwLTUgdG8gcmVzdHJpY3QgZXJyb3Jz IHRvIGNlcnRhaW4gdmVyYm9zaXR5IGxldmVscy4KIAotICAgIGdpdC1jb21taXQ9PENPTU1JVElT SD4KLSAgICAgIENoZWNrIHN0eWxlIGZvciBhIHNwZWNpZmllZCBnaXQgY29tbWl0LgotICAgICAg Tm90ZSB0aGF0IHRoZSBwcm9ncmFtIGNoZWNrcyBzdHlsZSBiYXNlZCBvbiBjdXJyZW50IGxvY2Fs IGZpbGUKLSAgICAgIGluc3RlYWQgb2YgYWN0dWFsIGRpZmYgb2YgdGhlIGdpdCBjb21taXQuICBT bywgaWYgdGhlIGZpbGVzIGFyZQotICAgICAgdXBkYXRlZCBhZnRlciB0aGUgc3BlY2lmaWVkIGdp dCBjb21taXQsIHRoZSBpbmZvcm1hdGlvbiBvZiBsaW5lCi0gICAgICBudW1iZXIgbWF5IGJlIHdy b25nLgorICAgIGdpdC1jb21taXQ9PFNpbmdsZUNvbW1pdD4KKyAgICAgIENoZWNrcyB0aGUgc3R5 bGUgb2YgZXZlcnl0aGluZyBmcm9tIHRoZSBnaXZlbiBjb21taXQgdG8gdGhlIGxvY2FsIHRyZWUu CiAKICAgICBvdXRwdXQ9dnM3CiAgICAgICBCeSBkZWZhdWx0LCB0aGUgb3V0cHV0IGlzIGZvcm1h dHRlZCB0byBlYXNlIGVtYWNzIHBhcnNpbmcuICBWaXN1YWwgU3R1ZGlvCkBAIC0xNTIsNyArMTQ4 LDE0IEBAIGRlZiBtYWluKCk6CiAgICAgICAgIHNjbSA9IGRldGVjdF9zY21fc3lzdGVtKGN3ZCkK IAogICAgICAgICBpZiAiLS1naXQtY29tbWl0IiBpbiBmbGFnczoKLSAgICAgICAgICAgIHByb2Nl c3NfcGF0Y2goc2NtLmNyZWF0ZV9wYXRjaF9mcm9tX2xvY2FsX2NvbW1pdChmbGFnc1siLS1naXQt Y29tbWl0Il0pKQorICAgICAgICAgICAgY29tbWl0aXNoID0gZmxhZ3NbIi0tZ2l0LWNvbW1pdCJd CisgICAgICAgICAgICBpZiBjb21taXRpc2guZmluZCgnLi4nKToKKyAgICAgICAgICAgICAgICAj IEZJWE1FOiBJZiB0aGUgcmFuZ2UgaXMgYSAiLi4uIiwgdGhlIGNvZGUgc2hvdWxkIGZpbmQgdGhl IGNvbW1vbiBhbmNlc3RvLAorICAgICAgICAgICAgICAgICMgZG8gdGhlIGRpZmYgZnJvbSB0aGVy ZS4KKyAgICAgICAgICAgICAgICBjb21taXRpc2ggPSBjb21taXRpc2hbOmNvbW1pdGlzaC5maW5k KCcuLicpXQorICAgICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIldhcm5pbmc6IFJhbmdl cyBhcmUgbm90IHN1cHBvcnRlZCBmb3IgLS1naXQtY29tbWl0LiBDaGVja2luZyBhbGwgY2hhbmdl cyBzaW5jZSAlcy5cbiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgY29tbWl0 aXNoKQorICAgICAgICAgICAgcHJvY2Vzc19wYXRjaChzY20uY3JlYXRlX3BhdGNoX3NpbmNlX2xv Y2FsX2NvbW1pdChjb21taXRpc2gpKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcHJvY2Vz c19wYXRjaChzY20uY3JlYXRlX3BhdGNoKCkpCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9zY20ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5 CmluZGV4IGJiODBjODMuLjMyNmYxZGIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9zY20ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQpA QCAtMTk1LDEwICsxOTUsMTMgQEAgY2xhc3MgU0NNOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1l bnRlZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIKIAogICAgIGRlZiBjcmVhdGVf cGF0Y2hfZnJvbV9sb2NhbF9jb21taXQoc2VsZiwgY29tbWl0X2lkKToKLSAgICAgICAgcGFzcwor ICAgICAgICBlcnJvcigiWW91ciBzb3VyY2UgY29udHJvbCBtYW5hZ2VyIGRvZXMgbm90IHN1cHBv cnQgY3JlYXRpbmcgYSBwYXRjaCBmcm9tIGEgbG9jYWwgY29tbWl0LiIpCisKKyAgICBkZWYgY3Jl YXRlX3BhdGNoX3NpbmNlX2xvY2FsX2NvbW1pdChzZWxmLCBjb21taXRfaWQpOgorICAgICAgICBl cnJvcigiWW91ciBzb3VyY2UgY29udHJvbCBtYW5hZ2VyIGRvZXMgbm90IHN1cHBvcnQgY3JlYXRp bmcgYSBwYXRjaCBmcm9tIGEgbG9jYWwgY29tbWl0LiIpCiAKICAgICBkZWYgY29tbWl0X2xvY2Fs bHlfd2l0aF9tZXNzYWdlKHNlbGYsIG1lc3NhZ2UpOgotICAgICAgICBwYXNzCisgICAgICAgIGVy cm9yKCJZb3VyIHNvdXJjZSBjb250cm9sIG1hbmFnZXIgZG9lcyBub3Qgc3VwcG9ydCBsb2NhbCBj b21taXRzLiIpCiAKICAgICBkZWYgZGlzY2FyZF9sb2NhbF9jb21taXRzKHNlbGYpOgogICAgICAg ICBwYXNzCkBAIC0zNTQsNiArMzU3LDkgQEAgY2xhc3MgR2l0KFNDTSk6CiAgICAgZGVmIGNyZWF0 ZV9wYXRjaF9mcm9tX2xvY2FsX2NvbW1pdChzZWxmLCBjb21taXRfaWQpOgogICAgICAgICByZXR1 cm4gc2VsZi5ydW5fY29tbWFuZChbJ2dpdCcsICdkaWZmJywgY29tbWl0X2lkICsgIl4uLiIgKyBj b21taXRfaWRdKQogCisgICAgZGVmIGNyZWF0ZV9wYXRjaF9zaW5jZV9sb2NhbF9jb21taXQoc2Vs ZiwgY29tbWl0X2lkKToKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuX2NvbW1hbmQoWydnaXQnLCAn ZGlmZicsIGNvbW1pdF9pZF0pCisKICAgICBkZWYgY29tbWl0X2xvY2FsbHlfd2l0aF9tZXNzYWdl KHNlbGYsIG1lc3NhZ2UpOgogICAgICAgICBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0JywgJ2NvbW1p dCcsICctLWFsbCcsICctRicsICctJ10sIGlucHV0PW1lc3NhZ2UpCiAgICAgICAgIAo= 33921 2009-07-31 19:22:28 -0700 2009-07-31 19:26:47 -0700 Proposed fix. bug27908.txt text/plain 4443 levin ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2MTVkMGM1Li4yYTVlNGE1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMDct MzEgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZSAtLWdpdC1j b21taXQgaGFzIGJ1Z3MgaWYgeW91IHNlbGVjdCBhIGNvbW1pdCBpbiB0aGUgcGFzdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc5MDgKKworICAgICAg ICAqIFNjcmlwdHMvY2hlY2std2Via2l0LXN0eWxlOgorICAgICAgICAobWFpbik6IE1hZGUgdGhl IGdpdC1jb21taXQgY29tbWFuZCBvbmx5IHNlbGVjdCB0aGUgZmlyc3QgY29tbWl0CisgICAgICAg IGlmIGEgcmFuZ2UgaXMgZ2l2ZW4gKGFuZCBwcmludCBhIHdhcm5pbmcpLgorICAgICAgICAqIFNj cmlwdHMvbW9kdWxlcy9zY20ucHk6CisgICAgICAgIChTQ006OmNyZWF0ZV9wYXRjaF9mcm9tX2xv Y2FsX2NvbW1pdCk6CisgICAgICAgIChTQ006OmNyZWF0ZV9wYXRjaF9zaW5jZV9sb2NhbF9jb21t aXQpOgorICAgICAgICAoU0NNOjpjb21taXRfbG9jYWxseV93aXRoX21lc3NhZ2UpOgorICAgICAg ICAoU0NNOjpkaXNjYXJkX2xvY2FsX2NvbW1pdHMpOgorICAgICAgICBBZGRlZCBhbiBlcnJvciBt ZXNzYWdlcyBpbiBjYXNlIHRoZXNlIGFyZW4ndCBvdmVycmlkZW4uCisKKyAgICAgICAgKEdpdDo6 Y3JlYXRlX3BhdGNoX3NpbmNlX2xvY2FsX2NvbW1pdCk6CisgICAgICAgIEFkZGVkIHRoaXMgY29t bWFuZCB0byBhbGxvdyBkb2luZyBhIGRpZmYgb2YgZXZlcnl0aGluZyBhZnRlciBhIGdpdmVuIGNv bW1pdC4KKwogMjAwOS0wNy0zMCAgTWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBhIFF0IExpbnV4IGJ1aWxkIGJvdC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvY2hlY2std2Via2l0LXN0eWxlIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVjay13ZWJr aXQtc3R5bGUKaW5kZXggOWU2YzI0Zi4uMTQ4MTJhNyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVj ay13ZWJraXQtc3R5bGUKQEAgLTQyLDcgKzQyLDcgQEAgZnJvbSBtb2R1bGVzLnNjbSBpbXBvcnQg ZGV0ZWN0X3NjbV9zeXN0ZW0KIAogIyBPdmVycmlkZSB0aGUgdXNhZ2Ugb2YgdGhlIGxpbnQgdG9v bC4KIGNwcF9zdHlsZS5fVVNBR0UgPSAiIiIKLVN5bnRheDogJShwcm9ncmFtX25hbWUpcyBbLS12 ZXJib3NlPSNdIFstLWdpdC1jb21taXQ9PENPTU1JVElTSD5dIFstLW91dHB1dD12czddCitTeW50 YXg6ICUocHJvZ3JhbV9uYW1lKXMgWy0tdmVyYm9zZT0jXSBbLS1naXQtY29tbWl0PTxTaW5nbGVD b21taXQ+XSBbLS1vdXRwdXQ9dnM3XQogICAgICAgICBbLS1maWx0ZXI9LXgsK3ksLi4uXSBbZmls ZV0gLi4uCiAKICAgVGhlIHN0eWxlIGd1aWRlbGluZXMgdGhpcyB0cmllcyB0byBmb2xsb3cgYXJl IHRob3NlIGluCkBAIC02NiwxMiArNjYsOCBAQCBTeW50YXg6ICUocHJvZ3JhbV9uYW1lKXMgWy0t dmVyYm9zZT0jXSBbLS1naXQtY29tbWl0PTxDT01NSVRJU0g+XSBbLS1vdXRwdXQ9dnM3XQogICAg IHZlcmJvc2U9IwogICAgICAgU3BlY2lmeSBhIG51bWJlciAwLTUgdG8gcmVzdHJpY3QgZXJyb3Jz IHRvIGNlcnRhaW4gdmVyYm9zaXR5IGxldmVscy4KIAotICAgIGdpdC1jb21taXQ9PENPTU1JVElT SD4KLSAgICAgIENoZWNrIHN0eWxlIGZvciBhIHNwZWNpZmllZCBnaXQgY29tbWl0LgotICAgICAg Tm90ZSB0aGF0IHRoZSBwcm9ncmFtIGNoZWNrcyBzdHlsZSBiYXNlZCBvbiBjdXJyZW50IGxvY2Fs IGZpbGUKLSAgICAgIGluc3RlYWQgb2YgYWN0dWFsIGRpZmYgb2YgdGhlIGdpdCBjb21taXQuICBT bywgaWYgdGhlIGZpbGVzIGFyZQotICAgICAgdXBkYXRlZCBhZnRlciB0aGUgc3BlY2lmaWVkIGdp dCBjb21taXQsIHRoZSBpbmZvcm1hdGlvbiBvZiBsaW5lCi0gICAgICBudW1iZXIgbWF5IGJlIHdy b25nLgorICAgIGdpdC1jb21taXQ9PFNpbmdsZUNvbW1pdD4KKyAgICAgIENoZWNrcyB0aGUgc3R5 bGUgb2YgZXZlcnl0aGluZyBmcm9tIHRoZSBnaXZlbiBjb21taXQgdG8gdGhlIGxvY2FsIHRyZWUu CiAKICAgICBvdXRwdXQ9dnM3CiAgICAgICBCeSBkZWZhdWx0LCB0aGUgb3V0cHV0IGlzIGZvcm1h dHRlZCB0byBlYXNlIGVtYWNzIHBhcnNpbmcuICBWaXN1YWwgU3R1ZGlvCkBAIC0xNTIsNyArMTQ4 LDEzIEBAIGRlZiBtYWluKCk6CiAgICAgICAgIHNjbSA9IGRldGVjdF9zY21fc3lzdGVtKGN3ZCkK IAogICAgICAgICBpZiAiLS1naXQtY29tbWl0IiBpbiBmbGFnczoKLSAgICAgICAgICAgIHByb2Nl c3NfcGF0Y2goc2NtLmNyZWF0ZV9wYXRjaF9mcm9tX2xvY2FsX2NvbW1pdChmbGFnc1siLS1naXQt Y29tbWl0Il0pKQorICAgICAgICAgICAgY29tbWl0ID0gZmxhZ3NbIi0tZ2l0LWNvbW1pdCJdCisg ICAgICAgICAgICBpZiAnLi4nIGluIGNvbW1pdDoKKyAgICAgICAgICAgICAgICAjIEZJWE1FOiBJ ZiB0aGUgcmFuZ2UgaXMgYSAiLi4uIiwgdGhlIGNvZGUgc2hvdWxkIGZpbmQgdGhlIGNvbW1vbiBh bmNlc3RvciBhbmQKKyAgICAgICAgICAgICAgICAjIHN0YXJ0IHRoZXJlIChzZWUgZ2l0IGRpZmYg LS1oZWxwIGZvciBpbmZvcm1hdGlvbiBhYm91dCBob3cgLi4uIHVzdWFsbHkgd29ya3MpLgorICAg ICAgICAgICAgICAgIGNvbW1pdCA9IGNvbW1pdFs6Y29tbWl0LmZpbmQoJy4uJyldCisgICAgICAg ICAgICAgICAgcHJpbnQgPj4gc3lzLnN0ZGVyciwgIldhcm5pbmc6IFJhbmdlcyBhcmUgbm90IHN1 cHBvcnRlZCBmb3IgLS1naXQtY29tbWl0LiBDaGVja2luZyBhbGwgY2hhbmdlcyBzaW5jZSAlcy5c biIgJSBjb21taXQKKyAgICAgICAgICAgIHByb2Nlc3NfcGF0Y2goc2NtLmNyZWF0ZV9wYXRjaF9z aW5jZV9sb2NhbF9jb21taXQoY29tbWl0KSkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHBy b2Nlc3NfcGF0Y2goc2NtLmNyZWF0ZV9wYXRjaCgpKQogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3Nj bS5weQppbmRleCBiYjgwYzgzLi4zMjZmMWRiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvc2NtLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20u cHkKQEAgLTE5NSwxMCArMTk1LDEzIEBAIGNsYXNzIFNDTToKICAgICAgICAgcmFpc2UgTm90SW1w bGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCiAKICAgICBkZWYgY3Jl YXRlX3BhdGNoX2Zyb21fbG9jYWxfY29tbWl0KHNlbGYsIGNvbW1pdF9pZCk6Ci0gICAgICAgIHBh c3MKKyAgICAgICAgZXJyb3IoIllvdXIgc291cmNlIGNvbnRyb2wgbWFuYWdlciBkb2VzIG5vdCBz dXBwb3J0IGNyZWF0aW5nIGEgcGF0Y2ggZnJvbSBhIGxvY2FsIGNvbW1pdC4iKQorCisgICAgZGVm IGNyZWF0ZV9wYXRjaF9zaW5jZV9sb2NhbF9jb21taXQoc2VsZiwgY29tbWl0X2lkKToKKyAgICAg ICAgZXJyb3IoIllvdXIgc291cmNlIGNvbnRyb2wgbWFuYWdlciBkb2VzIG5vdCBzdXBwb3J0IGNy ZWF0aW5nIGEgcGF0Y2ggZnJvbSBhIGxvY2FsIGNvbW1pdC4iKQogCiAgICAgZGVmIGNvbW1pdF9s b2NhbGx5X3dpdGhfbWVzc2FnZShzZWxmLCBtZXNzYWdlKToKLSAgICAgICAgcGFzcworICAgICAg ICBlcnJvcigiWW91ciBzb3VyY2UgY29udHJvbCBtYW5hZ2VyIGRvZXMgbm90IHN1cHBvcnQgbG9j YWwgY29tbWl0cy4iKQogCiAgICAgZGVmIGRpc2NhcmRfbG9jYWxfY29tbWl0cyhzZWxmKToKICAg ICAgICAgcGFzcwpAQCAtMzU0LDYgKzM1Nyw5IEBAIGNsYXNzIEdpdChTQ00pOgogICAgIGRlZiBj cmVhdGVfcGF0Y2hfZnJvbV9sb2NhbF9jb21taXQoc2VsZiwgY29tbWl0X2lkKToKICAgICAgICAg cmV0dXJuIHNlbGYucnVuX2NvbW1hbmQoWydnaXQnLCAnZGlmZicsIGNvbW1pdF9pZCArICJeLi4i ICsgY29tbWl0X2lkXSkKIAorICAgIGRlZiBjcmVhdGVfcGF0Y2hfc2luY2VfbG9jYWxfY29tbWl0 KHNlbGYsIGNvbW1pdF9pZCk6CisgICAgICAgIHJldHVybiBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0 JywgJ2RpZmYnLCBjb21taXRfaWRdKQorCiAgICAgZGVmIGNvbW1pdF9sb2NhbGx5X3dpdGhfbWVz c2FnZShzZWxmLCBtZXNzYWdlKToKICAgICAgICAgc2VsZi5ydW5fY29tbWFuZChbJ2dpdCcsICdj b21taXQnLCAnLS1hbGwnLCAnLUYnLCAnLSddLCBpbnB1dD1tZXNzYWdlKQogICAgICAgICAK