77886 2012-02-06 11:08:39 -0800 KeywordLookupGenerator.py script fails in some cases 2012-02-12 21:00:46 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 0 ashodnakashian webkit-unassigned abarth barraclough benjamin darin eric levin mjs msaboff ojan oliver sam webkit.review.bot oldest_to_newest 550115 0 ashodnakashian 2012-02-06 11:08:39 -0800 KeywordLookupGenerator.py splits the input file by newline characters ('\n') using the split() function. The code also trims each line of whitespaces after splitting. However, carriage-return ('\r') isn't necessarily a whitespace character, and, if it exists in the input file, it remains dangling at the end of the the lines. This is not an issue for most lines, except for the first and last, where they are compared verbatim with the expected values. On my build system (Win7/CygWin/Python2.6) the last line is '@end\r' which fails to compare with the expected '@end' and thereby the complete input file fails to parse and the script exists with an exception. This in turn breaks the build. The generic fix is to also assume the input may contain both carriage-returns and split by both newline and carriage-return characters (empty lines are removed anyway). 550193 1 125688 ashodnakashian 2012-02-06 12:27:14 -0800 Created attachment 125688 Patch 550225 2 125688 benjamin 2012-02-06 13:08:18 -0800 Comment on attachment 125688 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125688&action=review I am not sure why the input would use the Windows line ending. Is that converted automatically by git/svn? > Source/JavaScriptCore/ChangeLog:7 > + Reviewed by NOBODY (OOPS!). > + Missing explanation in the ChangeLog. > Source/JavaScriptCore/ChangeLog:8 > + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: ??? 550228 3 125688 eric 2012-02-06 13:09:32 -0800 Comment on attachment 125688 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125688&action=review This whole split cascade is a bit odd. Is this file not unittested? Normally we test all changes in WebKit, including python changes. > Source/JavaScriptCore/ChangeLog:8 > + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: Looks like you didn't actually change this file. 550586 4 125760 ashodnakashian 2012-02-06 20:46:38 -0800 Created attachment 125760 Patch 550616 5 ashodnakashian 2012-02-06 21:48:13 -0800 (In reply to comment #2) > (From update of attachment 125688 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=125688&action=review > > I am not sure why the input would use the Windows line ending. Is that converted automatically by git/svn? I wouldn't know, but I went back half a dozen or so commits of the input file and found no changes to the last line. This suggests the file did contain cr and it wasn't causing problems. Considering that the split also trims the strings of whitespace, and considering that in the past I have successfully run this script on WinXP, I'm suspecting it has something to do with the default whitespace list of python in the given version/build/system. There might be some other explanation, but I find this the most reasonable at this point. At any rate, I think non-print chars like this are bound to creep-in considering that we work on multiple platforms. My suggested fix is to take cr into account and treat them as splitting character as well. There are other solutions too, but probably not as generic. > > > Source/JavaScriptCore/ChangeLog:7 > > + Reviewed by NOBODY (OOPS!). > > + > > Missing explanation in the ChangeLog. Fixed. > > > Source/JavaScriptCore/ChangeLog:8 > > + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: > > ??? Removed. No idea why the patch script thought this modified. 550618 6 ashodnakashian 2012-02-06 21:51:46 -0800 (In reply to comment #3) > (From update of attachment 125688 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=125688&action=review > > This whole split cascade is a bit odd. Is this file not unittested? Normally we test all changes in WebKit, including python changes. Agreed on the odd part, but considering that line breaks aren't predictable, we either have to remove carriage-returns (before or after splitting) or we have to be more generic and break at CR as well as LF. After all, we *can* have lines with CR breaks only. > > > Source/JavaScriptCore/ChangeLog:8 > > + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: > > Looks like you didn't actually change this file. Fixed. 551239 7 darin 2012-02-07 12:26:50 -0800 (In reply to comment #6) > line breaks aren't predictable Maybe true for the programming world at large, but need not be true for the WebKit project. We can make whatever rule we like about line breaks. There is no good reason for us to support CR or CRLF line breaks in project tools; we should consistently set properties so our source files all use LF line breaks except for the small number of files that may be subject to specific platform requirements on Windows that might require something different. > After all, we *can* have lines with CR breaks only. Not a goal for the project. 551737 8 ashodnakashian 2012-02-07 20:23:10 -0800 (In reply to comment #7) > (In reply to comment #6) > > line breaks aren't predictable > > Maybe true for the programming world at large, but need not be true for the WebKit project. We can make whatever rule we like about line breaks. There is no good reason for us to support CR or CRLF line breaks in project tools; we should consistently set properties so our source files all use LF line breaks except for the small number of files that may be subject to specific platform requirements on Windows that might require something different. > > > After all, we *can* have lines with CR breaks only. > > Not a goal for the project. Fair enough. However, I'd like to avoid accidental mistakes as much as possible. I see 3 possible solutions: 1) Force LF only via tests and convert the input file. 2) Force LF only on the input file via a commit-time hook (git would make that a breeze, alas). 3) Accept my patch which by only adding one line supports the current input file as-is. I don't know whether or not we have tests for build scripts and specifically for KeywordLookupGenerator.py. Any tips are welcome. I don't know how to add SVN commit-time hooks on the client. I've submitted a working patch as the third alternative. Of course we can always manually fix the input file, until it fails again on someone... or pick on of the above (or another suggestion?) Let me know what's the preferred action in a similar case for WebKit. 551744 9 benjamin 2012-02-07 20:37:10 -0800 > Fair enough. However, I'd like to avoid accidental mistakes as much as possible. I see 3 possible solutions: > > 1) Force LF only via tests and convert the input file. Yep, you can do that with check-webkit-style. Optionally you can add support for converting automatically the input file through webkit-patch. > Of course we can always manually fix the input file, until it fails again on someone... or pick on of the above (or another suggestion?) Given no port nor bot require support for this, I think Darin has a fair point about not supporting CRLF here. 551774 10 ashodnakashian 2012-02-07 21:35:53 -0800 (In reply to comment #9) > > Fair enough. However, I'd like to avoid accidental mistakes as much as possible. I see 3 possible solutions: > > > > 1) Force LF only via tests and convert the input file. > > Yep, you can do that with check-webkit-style. Optionally you can add support for converting automatically the input file through webkit-patch. Great. I'll make the appropriate changes in at least check-webkit-style and possibly auto-convert in webkit-patch and resubmit. > > > Of course we can always manually fix the input file, until it fails again on someone... or pick on of the above (or another suggestion?) > > Given no port nor bot require support for this, I think Darin has a fair point about not supporting CRLF here. Sure. 554610 11 126629 ashodnakashian 2012-02-11 05:09:16 -0800 Created attachment 126629 Patch 554691 12 126629 benjamin 2012-02-11 14:05:22 -0800 Comment on attachment 126629 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126629&action=review Some nitpicking: > Source/JavaScriptCore/ChangeLog:12 > + Keywords.table has been converted to LF-only. > + > + * parser/Keywords.table: The line "* parser/Keywords.table:" is made for the comments about that file. You should have: * parser/Keywords.table: Converted to LF-only. > Source/JavaScriptCore/parser/Keywords.table:38 > -# reserved for future use > +# reserved for future use. Our rule is "Make comments look like sentences by starting with a capital letter and ending with a period (punctation)." If you fix the period, you should fix the capital letter :) > Source/JavaScriptCore/parser/Keywords.table:49 > -# reserved for future use in strict code > +# reserved for future use in strict code. ditto > Tools/ChangeLog:10 > + Keywords.table has been converted to LF-only. This should not be part of this particular ChangeLog. > Tools/Scripts/webkitpy/style/checker.py:243 > + # This is only critical for the first and last lines > + # which are compared verbatim. This is describing an implementation detail in an other script, it is a bad idea to have that in a comment. You can drop those lines. > Tools/Scripts/webkitpy/style/checker_unittest.py:273 > + path = "Source/JavaScriptCore/parser/Keywords.table" > + assertCheck(path, "whitespace/carriage_return") No need for the variable "path", follow the style of this function passing strings as literal. 554814 13 ashodnakashian 2012-02-12 05:14:14 -0800 (In reply to comment #12) > (From update of attachment 126629 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=126629&action=review > > Some nitpicking: > Thanks for all the help. All of your notes make sense. Since some of them are project-specific, without knowing what WebKit specifically prefers, I err on the safer side of being as conforming as much as possible (hence not fixing the case of the first letter and creating a superfluous path variable.) 554815 14 126675 ashodnakashian 2012-02-12 05:43:10 -0800 Created attachment 126675 Patch 554940 15 126675 benjamin 2012-02-12 18:47:43 -0800 Comment on attachment 126675 Patch Looks good. Thanks for the patch. 554987 16 126675 webkit.review.bot 2012-02-12 21:00:40 -0800 Comment on attachment 126675 Patch Clearing flags on attachment: 126675 Committed r107527: <http://trac.webkit.org/changeset/107527> 554988 17 webkit.review.bot 2012-02-12 21:00:46 -0800 All reviewed patches have been landed. Closing bug. 125688 2012-02-06 12:27:14 -0800 2012-02-06 20:43:58 -0800 Patch bug-77886-20120207002710.patch text/plain 1294 ashodnakashian SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA2ODI1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDEyLTAyLTA2ICBBc2hvZCBOYWthc2hpYW4gIDxhc2hvZG5ha2FzaGlhbkB5YWhvby5jb20+ CisKKyAgICAgICAgS2V5d29yZExvb2t1cEdlbmVyYXRvci5weSBzY3JpcHQgZmFpbHMgaW4gc29t ZSBjYXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Nzc4ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEphdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5kZWY6 CisgICAgICAgICogS2V5d29yZExvb2t1cEdlbmVyYXRvci5weToKKyAgICAgICAgKHBhcnNlS2V5 d29yZHMpOgorCiAyMDEyLTAyLTA2ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgV2luQ0UgYnVpbGQgZml4IGFmdGVyIHIxMDYxOTcu CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvS2V5d29yZExvb2t1cEdlbmVyYXRvci5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvS2V5d29yZExvb2t1cEdlbmVyYXRv ci5weQkocmV2aXNpb24gMTA2ODIxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0tleXdvcmRM b29rdXBHZW5lcmF0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTU5LDYgKzU5LDcgQEAgZGVmIGFs bFdoaXRlc3BhY2Uoc3RyKToKIAogZGVmIHBhcnNlS2V5d29yZHMoa2V5d29yZHNUZXh0KToKICAg ICBsaW5lcyA9IGtleXdvcmRzVGV4dC5zcGxpdCgiXG4iKQorICAgIGxpbmVzID0gW2wgZm9yIGxp bmUgaW4gbGluZXMgZm9yIGwgaW4gbGluZS5zcGxpdCgiXHIiKV0gICMgc3BsaXQgYnkgXHIgYXMg d2VsbC4KICAgICBsaW5lcyA9IFtsaW5lLnNwbGl0KCIjIilbMF0gZm9yIGxpbmUgaW4gbGluZXNd CiAgICAgbGluZXMgPSBbbGluZSBmb3IgbGluZSBpbiBsaW5lcyBpZiAobm90IGFsbFdoaXRlc3Bh Y2UobGluZSkpXQogICAgIG5hbWUgPSBsaW5lc1swXS5zcGxpdCgpCg== 125760 2012-02-06 20:46:38 -0800 2012-02-11 05:09:03 -0800 Patch bug-77886-20120207084635.patch text/plain 1265 ashodnakashian SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA2ODI1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDEyLTAyLTA2ICBBc2hvZCBOYWthc2hpYW4gIDxhc2hvZG5ha2FzaGlhbkB5YWhvby5jb20+ CisKKyAgICAgICAgS2V5d29yZExvb2t1cEdlbmVyYXRvci5weSBzY3JpcHQgZmFpbHMgaW4gc29t ZSBjYXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Nzc4ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEtleXdvcmRMb29rdXBHZW5lcmF0b3IucHk6CisgICAgICAgIChwYXJzZUtleXdvcmRzKTogU3Bs aXQgaW5wdXQgbGluZXMgYnkgXHIgYXMgd2VsbCBhcyBcbi4KKwogMjAxMi0wMi0wNiAgUGF0cmlj ayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIFdp bkNFIGJ1aWxkIGZpeCBhZnRlciByMTA2MTk3LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L0tleXdvcmRMb29rdXBHZW5lcmF0b3IucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL0tleXdvcmRMb29rdXBHZW5lcmF0b3IucHkJKHJldmlzaW9uIDEwNjgyMSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9LZXl3b3JkTG9va3VwR2VuZXJhdG9yLnB5CSh3b3JraW5nIGNv cHkpCkBAIC01OSw2ICs1OSw3IEBAIGRlZiBhbGxXaGl0ZXNwYWNlKHN0cik6CiAKIGRlZiBwYXJz ZUtleXdvcmRzKGtleXdvcmRzVGV4dCk6CiAgICAgbGluZXMgPSBrZXl3b3Jkc1RleHQuc3BsaXQo IlxuIikKKyAgICBsaW5lcyA9IFtsIGZvciBsaW5lIGluIGxpbmVzIGZvciBsIGluIGxpbmUuc3Bs aXQoIlxyIildICAjIHNwbGl0IGJ5IFxyIGFzIHdlbGwuCiAgICAgbGluZXMgPSBbbGluZS5zcGxp dCgiIyIpWzBdIGZvciBsaW5lIGluIGxpbmVzXQogICAgIGxpbmVzID0gW2xpbmUgZm9yIGxpbmUg aW4gbGluZXMgaWYgKG5vdCBhbGxXaGl0ZXNwYWNlKGxpbmUpKV0KICAgICBuYW1lID0gbGluZXNb MF0uc3BsaXQoKQo= 126629 2012-02-11 05:09:16 -0800 2012-02-12 05:42:59 -0800 Patch bug-77886-20120211171224.patch text/plain 4188 ashodnakashian SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA3NDc2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDEyLTAyLTExICBBc2hvZCBOYWthc2hpYW4gIDxhc2hvZG5ha2FzaGlhbkB5YWhvby5jb20+ CisKKyAgICAgICAgS2V5d29yZExvb2t1cEdlbmVyYXRvci5weSBzY3JpcHQgZmFpbHMgaW4gc29t ZSBjYXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Nzc4ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBL ZXl3b3JkTG9va3VwR2VuZXJhdG9yIHNjcmlwdCBkb2Vzbid0IGV4cGVjdCBDUiBjaGFyYWN0ZXJz LCBzbyBwZXIgYnVnICM3Nzg4NiB0aGUgaW5wdXQgZmlsZQorICAgICAgICBpcyBub3cgc3ViamVj dCB0byBzdHlsZS1jaGVja2luZyB0byByZXF1aXJlIExGIG9ubHkgYW5kIG5vIENSLgorICAgICAg ICBLZXl3b3Jkcy50YWJsZSBoYXMgYmVlbiBjb252ZXJ0ZWQgdG8gTEYtb25seS4KKworICAgICAg ICAqIHBhcnNlci9LZXl3b3Jkcy50YWJsZToKKwogMjAxMi0wMi0xMCAgVmluZWV0IENoYXVkaGFy eSAgPHJnZjc0OEBtb3Rvcm9sYS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTcyNzU2CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL0tleXdvcmRzLnRhYmxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9w YXJzZXIvS2V5d29yZHMudGFibGUJKHJldmlzaW9uIDEwNzQ3NikKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wYXJzZXIvS2V5d29yZHMudGFibGUJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1 LDcgQEAgdHlwZW9mCQlUWVBFT0YKIHdpdGgJCVdJVEgKIGRlYnVnZ2VyCURFQlVHR0VSCiAKLSMg cmVzZXJ2ZWQgZm9yIGZ1dHVyZSB1c2UKKyMgcmVzZXJ2ZWQgZm9yIGZ1dHVyZSB1c2UuCiBjbGFz cyAgICAgICAgICAgUkVTRVJWRUQKIGVudW0gICAgICAgICAgICBSRVNFUlZFRAogZXhwb3J0ICAg ICAgICAgIFJFU0VSVkVECkBAIC00Niw3ICs0Niw3IEBAIHN1cGVyICAgICAgICAgICBSRVNFUlZF RAogIyB0ZWNobmljYWxseSBSRVNFUlZFRF9JRl9TVFJJQ1QgaW4gRVM1LCBidXQgbWF5IGJlIHJl c2VydmVkIGluIEVTNi4KIGxldCAgICAgICAgICAgICBSRVNFUlZFRAogCi0jIHJlc2VydmVkIGZv ciBmdXR1cmUgdXNlIGluIHN0cmljdCBjb2RlCisjIHJlc2VydmVkIGZvciBmdXR1cmUgdXNlIGlu IHN0cmljdCBjb2RlLgogaW1wbGVtZW50cyAgICAgIFJFU0VSVkVEX0lGX1NUUklDVAogaW50ZXJm YWNlICAgICAgIFJFU0VSVkVEX0lGX1NUUklDVAogcGFja2FnZSAgICAgICAgIFJFU0VSVkVEX0lG X1NUUklDVApAQCAtNTcsNCArNTcsMyBAQCBzdGF0aWMgICAgICAgICAgUkVTRVJWRURfSUZfU1RS SUNUCiB5aWVsZCAgICAgICAgICAgUkVTRVJWRURfSUZfU1RSSUNUCiAKIEBlbmQKLQpJbmRleDog VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24g MTA3NDc2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTItMDItMTEgIEFzaG9kIE5ha2FzaGlhbiAgPGFzaG9kbmFrYXNoaWFuQHlhaG9vLmNv bT4KKworICAgICAgICBLZXl3b3JkTG9va3VwR2VuZXJhdG9yLnB5IHNjcmlwdCBmYWlscyBpbiBz b21lIGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03Nzg4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEtleXdvcmRMb29rdXBHZW5lcmF0b3Igc2NyaXB0IGRvZXNuJ3QgZXhwZWN0IENSIGNoYXJhY3Rl cnMsIHNvIHBlciBidWcgIzc3ODg2IHRoZSBpbnB1dCBmaWxlCisgICAgICAgIGlzIG5vdyBzdWJq ZWN0IHRvIHN0eWxlLWNoZWNraW5nIHRvIHJlcXVpcmUgTEYgb25seSBhbmQgbm8gQ1IuCisgICAg ICAgIEtleXdvcmRzLnRhYmxlIGhhcyBiZWVuIGNvbnZlcnRlZCB0byBMRi1vbmx5LgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weToKKyAgICAgICAgKEdsb2JhbFZh cmlhYmxlc1Rlc3QudGVzdF9wYXRoX3J1bGVzX3NwZWNpZmllcik6CisKIDIwMTItMDItMTAgIEFk YW0gS2xlaW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRW5hYmxlIE1VVEFUSU9O X09CU0VSVkVSUyBieSBkZWZhdWx0IG9uIGFsbCBwbGF0Zm9ybXMKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHJldmlzaW9uIDEwNzQ3NikKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQkod29ya2luZyBjb3B5KQpAQCAtMjM3LDYg KzIzNywxMiBAQCBfUEFUSF9SVUxFU19TUEVDSUZJRVIgPSBbCiAgICAgICAjIGFuZCBfX2ppdF9k ZWJ1Z19kZXNjcmlwdG9yIHdoZW4gaW50ZWdyYXRpbmcgd2l0aCBnZGIuCiAgICAgICAiU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9HREJJbnRlcmZhY2UuY3BwIl0sCiAgICAgIFsiLXJlYWRhYmls aXR5L25hbWluZyJdKSwKKworICAgIChbIyBPbiBzb21lIHN5c3RlbXMgdGhlIHRyYWlsaW5nIENS IGlzIGNhdXNpbmcgcGFyc2VyIGZhaWx1cmUuCisgICAgICAjIFRoaXMgaXMgb25seSBjcml0aWNh bCBmb3IgdGhlIGZpcnN0IGFuZCBsYXN0IGxpbmVzCisgICAgICAjIHdoaWNoIGFyZSBjb21wYXJl ZCB2ZXJiYXRpbS4KKyAgICAgICJTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0tleXdvcmRz LnRhYmxlIl0sCisgICAgIFsiK3doaXRlc3BhY2UvY2FycmlhZ2VfcmV0dXJuIl0pLAogXQogCiAK QEAgLTI3MSw2ICsyNzcsNyBAQCBfVEVYVF9GSUxFX0VYVEVOU0lPTlMgPSBbCiAgICAgJ3Bybycs CiAgICAgJ3JiJywKICAgICAnc2gnLAorICAgICd0YWJsZScsCiAgICAgJ3R4dCcsCiAgICAgJ3dt JywKICAgICAneGh0bWwnLApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcl91bml0dGVzdC5weQkocmV2aXNpb24gMTA3NDc2KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y NjgsNiArMjY4LDEwIEBAIGNsYXNzIEdsb2JhbFZhcmlhYmxlc1Rlc3QodW5pdHRlc3QuVGVzdEMK ICAgICAgICAgYXNzZXJ0Tm9DaGVjaygiU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9HREJJbnRl cmZhY2UuY3BwIiwKICAgICAgICAgICAgICAgICAgICAgICAicmVhZGFiaWxpdHkvbmFtaW5nIikK IAorICAgICAgICAjIEphdmFzY3JpcHQga2V5d29yZHMuCisgICAgICAgIHBhdGggPSAiU291cmNl L0phdmFTY3JpcHRDb3JlL3BhcnNlci9LZXl3b3Jkcy50YWJsZSIKKyAgICAgICAgYXNzZXJ0Q2hl Y2socGF0aCwgIndoaXRlc3BhY2UvY2FycmlhZ2VfcmV0dXJuIikKKwogICAgIGRlZiB0ZXN0X21h eF9yZXBvcnRzX3Blcl9jYXRlZ29yeShzZWxmKToKICAgICAgICAgIiIiQ2hlY2sgdGhhdCBfTUFY X1JFUE9SVFNfUEVSX0NBVEVHT1JZIGlzIHZhbGlkLiIiIgogICAgICAgICBhbGxfY2F0ZWdvcmll cyA9IHNlbGYuX2FsbF9jYXRlZ29yaWVzKCkK 126675 2012-02-12 05:43:10 -0800 2012-02-12 21:00:40 -0800 Patch bug-77886-20120212174607.patch text/plain 3954 ashodnakashian SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA3NTA5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBA CisyMDEyLTAyLTEyICBBc2hvZCBOYWthc2hpYW4gIDxhc2hvZG5ha2FzaGlhbkB5YWhvby5jb20+ CisKKyAgICAgICAgS2V5d29yZExvb2t1cEdlbmVyYXRvci5weSBzY3JpcHQgZmFpbHMgaW4gc29t ZSBjYXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Nzc4ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBhcnNlci9LZXl3b3Jkcy50YWJsZTogQ29udmVydGVkIHRvIExGLW9ubHkuCisKIDIwMTItMDIt MTIgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBERkc6OlNwZWN1 bGF0aXZlSklUIGNhbGxzIGZwcmludGYoKSBpbnN0ZWFkIG9mIGRhdGFMb2cgaW4gdGVybWluYXRl U3BlY3VsYXRpdmVFeGVjdXRpb24oKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNl ci9LZXl3b3Jkcy50YWJsZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL0tleXdvcmRzLnRhYmxlCShyZXZpc2lvbiAxMDc1MDkpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcGFyc2VyL0tleXdvcmRzLnRhYmxlCSh3b3JraW5nIGNvcHkpCkBAIC0xLDEyICsxLDEy IEBACi0jIG1haW4ga2V5d29yZHMKKyMgTWFpbiBrZXl3b3Jkcy4KIEBiZWdpbiBtYWluVGFibGUg NDcKIAotIyB0eXBlcworIyBUeXBlcy4KIG51bGwJCU5VTExUT0tFTgogdHJ1ZQkJVFJVRVRPS0VO CiBmYWxzZQkJRkFMU0VUT0tFTgogCi0jIGtleXdvcmRzCisjIEtleXdvcmRzLgogYnJlYWsJCUJS RUFLCiBjYXNlCQlDQVNFCiBjYXRjaAkJQ0FUQ0gKQEAgLTM1LDcgKzM1LDcgQEAgdHlwZW9mCQlU WVBFT0YKIHdpdGgJCVdJVEgKIGRlYnVnZ2VyCURFQlVHR0VSCiAKLSMgcmVzZXJ2ZWQgZm9yIGZ1 dHVyZSB1c2UKKyMgUmVzZXJ2ZWQgZm9yIGZ1dHVyZSB1c2UuCiBjbGFzcyAgICAgICAgICAgUkVT RVJWRUQKIGVudW0gICAgICAgICAgICBSRVNFUlZFRAogZXhwb3J0ICAgICAgICAgIFJFU0VSVkVE CkBAIC00Niw3ICs0Niw3IEBAIHN1cGVyICAgICAgICAgICBSRVNFUlZFRAogIyB0ZWNobmljYWxs eSBSRVNFUlZFRF9JRl9TVFJJQ1QgaW4gRVM1LCBidXQgbWF5IGJlIHJlc2VydmVkIGluIEVTNi4K IGxldCAgICAgICAgICAgICBSRVNFUlZFRAogCi0jIHJlc2VydmVkIGZvciBmdXR1cmUgdXNlIGlu IHN0cmljdCBjb2RlCisjIFJlc2VydmVkIGZvciBmdXR1cmUgdXNlIGluIHN0cmljdCBjb2RlLgog aW1wbGVtZW50cyAgICAgIFJFU0VSVkVEX0lGX1NUUklDVAogaW50ZXJmYWNlICAgICAgIFJFU0VS VkVEX0lGX1NUUklDVAogcGFja2FnZSAgICAgICAgIFJFU0VSVkVEX0lGX1NUUklDVApAQCAtNTcs NCArNTcsMyBAQCBzdGF0aWMgICAgICAgICAgUkVTRVJWRURfSUZfU1RSSUNUCiB5aWVsZCAgICAg ICAgICAgUkVTRVJWRURfSUZfU1RSSUNUCiAKIEBlbmQKLQpJbmRleDogVG9vbHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTA3NTA5KQorKysgVG9v bHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDItMTIg IEFzaG9kIE5ha2FzaGlhbiAgPGFzaG9kbmFrYXNoaWFuQHlhaG9vLmNvbT4KKworICAgICAgICBL ZXl3b3JkTG9va3VwR2VuZXJhdG9yLnB5IHNjcmlwdCBmYWlscyBpbiBzb21lIGNhc2VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Nzg4NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9jaGVja2VyLnB5OiBOZXcgcnVsZSBmb3IgS2V5d29yZHMudGFibGUgdG8gbm90 IGhhdmUgQ1IuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0 ZXN0LnB5OiBOZXcgVVQgZm9yIEtleXdvcmRzLnRhYmxlIHJ1bGUuCisgICAgICAgIChHbG9iYWxW YXJpYWJsZXNUZXN0LnRlc3RfcGF0aF9ydWxlc19zcGVjaWZpZXIpOgorCiAyMDEyLTAyLTEyICBK b2UgVGhvbWFzICA8am9ldGhvbWFzQG1vdG9yb2xhLmNvbT4KIAogICAgICAgICBBZGQgdG9UZXh0 IGFuZCBpc1RleHROb2RlIGhlbHBlcnMgaW4gVGV4dCBjbGFzcy4KSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHJldmlzaW9uIDEwNzUwOSkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQkod29ya2luZyBjb3B5KQpAQCAtMjM3LDYg KzIzNywxMCBAQCBfUEFUSF9SVUxFU19TUEVDSUZJRVIgPSBbCiAgICAgICAjIGFuZCBfX2ppdF9k ZWJ1Z19kZXNjcmlwdG9yIHdoZW4gaW50ZWdyYXRpbmcgd2l0aCBnZGIuCiAgICAgICAiU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9HREJJbnRlcmZhY2UuY3BwIl0sCiAgICAgIFsiLXJlYWRhYmls aXR5L25hbWluZyJdKSwKKworICAgIChbIyBPbiBzb21lIHN5c3RlbXMgdGhlIHRyYWlsaW5nIENS IGlzIGNhdXNpbmcgcGFyc2VyIGZhaWx1cmUuCisgICAgICAiU291cmNlL0phdmFTY3JpcHRDb3Jl L3BhcnNlci9LZXl3b3Jkcy50YWJsZSJdLAorICAgICBbIit3aGl0ZXNwYWNlL2NhcnJpYWdlX3Jl dHVybiJdKSwKIF0KIAogCkBAIC0yNzEsNiArMjc1LDcgQEAgX1RFWFRfRklMRV9FWFRFTlNJT05T ID0gWwogICAgICdwcm8nLAogICAgICdyYicsCiAgICAgJ3NoJywKKyAgICAndGFibGUnLAogICAg ICd0eHQnLAogICAgICd3bScsCiAgICAgJ3hodG1sJywKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkJKHJldmlzaW9uIDEwNzUwOSkK KysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weQkod29y a2luZyBjb3B5KQpAQCAtMjY4LDYgKzI2OCw5IEBAIGNsYXNzIEdsb2JhbFZhcmlhYmxlc1Rlc3Qo dW5pdHRlc3QuVGVzdEMKICAgICAgICAgYXNzZXJ0Tm9DaGVjaygiU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9HREJJbnRlcmZhY2UuY3BwIiwKICAgICAgICAgICAgICAgICAgICAgICAicmVhZGFi aWxpdHkvbmFtaW5nIikKIAorICAgICAgICAjIEphdmFzY3JpcHQga2V5d29yZHMuCisgICAgICAg IGFzc2VydENoZWNrKCJTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0tleXdvcmRzLnRhYmxl IiwgIndoaXRlc3BhY2UvY2FycmlhZ2VfcmV0dXJuIikKKwogICAgIGRlZiB0ZXN0X21heF9yZXBv cnRzX3Blcl9jYXRlZ29yeShzZWxmKToKICAgICAgICAgIiIiQ2hlY2sgdGhhdCBfTUFYX1JFUE9S VFNfUEVSX0NBVEVHT1JZIGlzIHZhbGlkLiIiIgogICAgICAgICBhbGxfY2F0ZWdvcmllcyA9IHNl bGYuX2FsbF9jYXRlZ29yaWVzKCkK