39514 2010-05-21 14:14:04 -0700 check-webkit-style shouldn't complain about not including a primary header file if none exists. 2011-04-15 08:40:09 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 levin webkit-unassigned agbakken cjerdonek commit-queue dslomov hamaji hayato levin webkit.review.bot oldest_to_newest 229090 0 levin 2010-05-21 14:14:04 -0700 For example, see this comment: https://bugs.webkit.org/show_bug.cgi?id=39327#c4 231447 1 levin 2010-05-27 13:43:58 -0700 *** Bug 39787 has been marked as a duplicate of this bug. *** 234456 2 57933 agbakken 2010-06-04 18:24:18 -0700 Created attachment 57933 Patch 234625 3 57968 agbakken 2010-06-05 10:36:45 -0700 Created attachment 57968 Patch 235824 4 levin 2010-06-09 09:25:31 -0700 It would be good if the patch had a test and I'm not certain of some of the changes done. I've added two folks who know this code much better than I do (and I'm hoping one of them will look this over). 236843 5 57968 hamaji 2010-06-11 08:25:03 -0700 Comment on attachment 57968 Patch Yeah, I think we want some test cases for this change. WebKitTools/Scripts/webkitpy/style/checkers/cpp.py:224 + def check_next_include_order(self, header_type, file_is_header, include_state): I think we can just use self as include_state? WebKitTools/Scripts/webkitpy/style/checkers/cpp.py:2875 + for line_number in xrange(clean_lines.num_lines()): It's unfortunate we need to iterate all lines twice. Cannot we implement this by one-pass approach? Maybe it should be like 1. If primary header comes before config.h, emit a warning when we find config.h 2. If primary header isn't found between config.h and "other headers", set has_primary_header=False 3. If primary header is found after we see at least one "other headers", emit a warning. 386204 6 89691 dslomov 2011-04-14 17:14:35 -0700 Created attachment 89691 Simple fix This fix checks whether primary header exists, and only requires the #include if it does. 386209 7 webkit.review.bot 2011-04-14 17:17:35 -0700 Attachment 89691 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py:2615: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/style/checkers/cpp.py:2600: expected 2 blank lines, found 1 [pep8/E302] [5] Tools/Scripts/webkitpy/style/checkers/cpp.py:2601: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/style/checkers/cpp.py:2605: whitespace before ':' [pep8/E203] [5] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 386215 8 89691 levin 2011-04-14 17:25:43 -0700 Comment on attachment 89691 Simple fix View in context: https://bugs.webkit.org/attachment.cgi?id=89691&action=review What the stylebot said plus a few other things to consider. > Tools/Scripts/webkitpy/style/checkers/cpp.py:315 > + def check_next_include_order(self, header_type, file_is_header, has_primary_header): has_primary_header seems ambiguous to me. What about primary_header_exists? >> Tools/Scripts/webkitpy/style/checkers/cpp.py:2600 >> +def _has_primary_header(filename): > > expected 2 blank lines, found 1 [pep8/E302] [5] Consider: _does_primary_header_exist() > Tools/Scripts/webkitpy/style/checkers/cpp.py:2602 > + if the file is not source file or primary header does not exist Add . > Tools/Scripts/webkitpy/style/checkers/cpp.py:2608 > + if os.path.isfile(primary_header): You could just return os.path.isfile(primary_header) > Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py:2592 > + # File with non-existing primary header should not produce errors Add . after comments (and other places). 386224 9 89701 dslomov 2011-04-14 17:36:14 -0700 Created attachment 89701 Simple fix + CR addressed CR addressed + style violations (sorry - I keep forgetting running the cop - I will). 386643 10 commit-queue 2011-04-15 08:36:52 -0700 The commit-queue encountered the following flaky tests while processing attachment 89701: http/tests/xmlhttprequest/basic-auth-default.html bug 58666 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 386645 11 89701 commit-queue 2011-04-15 08:40:04 -0700 Comment on attachment 89701 Simple fix + CR addressed Clearing flags on attachment: 89701 Committed r83977: <http://trac.webkit.org/changeset/83977> 386646 12 commit-queue 2011-04-15 08:40:09 -0700 All reviewed patches have been landed. Closing bug. 57933 2010-06-04 18:24:18 -0700 2010-06-05 10:36:40 -0700 Patch bug-39514-20100604182417.patch text/plain 5138 agbakken ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjNDkxMjI3MzY2YWQxNjZiOGRiYjNjMjg1ZThjZjkxMDFkN2RjZDdiLi5jMDcxZDI2 YzdhMTkzZGMwNDg0ODNkNjQ4NWY1ZjA4Mjc4ZTk5NmViIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTAtMDYtMDQgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFpbC5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY2hlY2std2Via2l0LXN0 eWxlIHNob3VsZG4ndCBjb21wbGFpbiBhYm91dCBub3QgaW5jbHVkaW5nIGEgcHJpbWFyeSBoZWFk ZXIgZmlsZSBpZiBub25lIGV4aXN0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5NTE0CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NwcC5weToKKwogMjAxMC0wNi0wNCAgTWFydGluIFJvYmluc29uICA8bXJvYmlu c29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4KZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5IGIvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKaW5kZXggYTc3YmZmMDg4 MGZjNDZmZDg1ZWVjMTM2MTVlNTMzNjg1YjY4MTdhNy4uZDAwYjk5MGU3NjY1YTQ1MmVkNjMzYjE1 ZDM1NmU0YzNkZWEwNTQ1ZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9jcHAucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9jcHAucHkKQEAgLTIxMiwxMiArMjEyLDE2IEBAIGNsYXNzIF9JbmNs dWRlU3RhdGUoZGljdCk6CiAgICAgICAgIGRpY3QuX19pbml0X18oc2VsZikKICAgICAgICAgc2Vs Zi5fc2VjdGlvbiA9IHNlbGYuX0lOSVRJQUxfU0VDVElPTgogICAgICAgICBzZWxmLl92aXNpdGVk X3ByaW1hcnlfc2VjdGlvbiA9IEZhbHNlCisgICAgICAgIHNlbGYuX2hhc19wcmltYXJ5X2hlYWRl ciA9IEZhbHNlCiAgICAgICAgIHNlbGYuaGVhZGVyX3R5cGVzID0gZGljdCgpOwogCiAgICAgZGVm IHZpc2l0ZWRfcHJpbWFyeV9zZWN0aW9uKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fdmlz aXRlZF9wcmltYXJ5X3NlY3Rpb24KIAotICAgIGRlZiBjaGVja19uZXh0X2luY2x1ZGVfb3JkZXIo c2VsZiwgaGVhZGVyX3R5cGUsIGZpbGVfaXNfaGVhZGVyKToKKyAgICBkZWYgaGFzX3ByaW1hcnlf aGVhZGVyKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5faGFzX3ByaW1hcnlfaGVhZGVyCisK KyAgICBkZWYgY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKHNlbGYsIGhlYWRlcl90eXBlLCBmaWxl X2lzX2hlYWRlciwgaW5jbHVkZV9zdGF0ZSk6CiAgICAgICAgICIiIlJldHVybnMgYSBub24tZW1w dHkgZXJyb3IgbWVzc2FnZSBpZiB0aGUgbmV4dCBoZWFkZXIgaXMgb3V0IG9mIG9yZGVyLgogCiAg ICAgICAgIFRoaXMgZnVuY3Rpb24gYWxzbyB1cGRhdGVzIHRoZSBpbnRlcm5hbCBzdGF0ZSB0byBi ZSByZWFkeSB0byBjaGVjawpAQCAtMjYxLDcgKzI2NSw3IEBAIGNsYXNzIF9JbmNsdWRlU3RhdGUo ZGljdCk6CiAgICAgICAgICAgICBzZWxmLl92aXNpdGVkX3ByaW1hcnlfc2VjdGlvbiA9IFRydWUK ICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGFzc2VydCBoZWFkZXJfdHlwZSA9PSBfT1RIRVJf SEVBREVSCi0gICAgICAgICAgICBpZiBub3QgZmlsZV9pc19oZWFkZXIgYW5kIHNlbGYuX3NlY3Rp b24gPCBzZWxmLl9QUklNQVJZX1NFQ1RJT046CisgICAgICAgICAgICBpZiBub3QgZmlsZV9pc19o ZWFkZXIgYW5kIHNlbGYuX3NlY3Rpb24gPCBzZWxmLl9QUklNQVJZX1NFQ1RJT04gYW5kIGluY2x1 ZGVfc3RhdGUuaGFzX3ByaW1hcnlfaGVhZGVyKCk6CiAgICAgICAgICAgICAgICAgZXJyb3JfbWVz c2FnZSA9IGJlZm9yZV9lcnJvcl9tZXNzYWdlCiAgICAgICAgICAgICBzZWxmLl9zZWN0aW9uID0g c2VsZi5fT1RIRVJfU0VDVElPTgogCkBAIC0yMTI3LDExICsyMTMxLDExIEBAIGRlZiBjaGVja19p bmNsdWRlX2xpbmUoZmlsZW5hbWUsIGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9u dW1iZXIsIGluY2x1CiAgICAgIyAgICAgICAgbWF5IGludm9sdmUgaGF2aW5nIHRoZSBlcnJvciBo YW5kbGVyIGNsYXNzZXMgZXhwb3NlIGEKICAgICAjICAgICAgICBzaG91bGRfY2hlY2soKSBtZXRo b2QsIGluIGFkZGl0aW9uIHRvIHRoZSB1c3VhbCBfX2NhbGxfXwogICAgICMgICAgICAgIG1ldGhv ZC4KKyAgICBhc3NlcnQgbGluZV9udW1iZXIgaW4gaW5jbHVkZV9zdGF0ZS5oZWFkZXJfdHlwZXMK ICAgICBsaW5lID0gY2xlYW5fbGluZXMubGluZXNbbGluZV9udW1iZXJdCiAKICAgICBtYXRjaGVk ID0gX1JFX1BBVFRFUk5fSU5DTFVERS5zZWFyY2gobGluZSkKLSAgICBpZiBub3QgbWF0Y2hlZDoK LSAgICAgICAgcmV0dXJuCisgICAgYXNzZXJ0IG1hdGNoZWQKIAogICAgIGluY2x1ZGUgPSBtYXRj aGVkLmdyb3VwKDIpCiAgICAgaXNfc3lzdGVtID0gKG1hdGNoZWQuZ3JvdXAoMSkgPT0gJzwnKQpA QCAtMjE1NCw5ICsyMTU4LDYgQEAgZGVmIGNoZWNrX2luY2x1ZGVfbGluZShmaWxlbmFtZSwgZmls ZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgaW5jbHUKICAgICBlbHNlOgog ICAgICAgICBpbmNsdWRlX3N0YXRlW2luY2x1ZGVdID0gbGluZV9udW1iZXIKIAotICAgIGhlYWRl cl90eXBlID0gX2NsYXNzaWZ5X2luY2x1ZGUoZmlsZW5hbWUsIGluY2x1ZGUsIGlzX3N5c3RlbSwg aW5jbHVkZV9zdGF0ZSkKLSAgICBpbmNsdWRlX3N0YXRlLmhlYWRlcl90eXBlc1tsaW5lX251bWJl cl0gPSBoZWFkZXJfdHlwZQotCiAgICAgIyBPbmx5IHByb2NlZWQgaWYgdGhpcyBpc24ndCBhIGR1 cGxpY2F0ZSBoZWFkZXIuCiAgICAgaWYgZHVwbGljYXRlX2hlYWRlcjoKICAgICAgICAgcmV0dXJu CkBAIC0yMTY2LDcgKzIxNjcsOCBAQCBkZWYgY2hlY2tfaW5jbHVkZV9saW5lKGZpbGVuYW1lLCBm aWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBpbmNsdQogICAgICMgMikg Zm9yIGhlYWRlciBmaWxlczogYWxwaGFiZXRpY2FsbHkgc29ydGVkCiAgICAgIyBUaGUgaW5jbHVk ZV9zdGF0ZSBvYmplY3Qga2VlcHMgdHJhY2sgb2YgdGhlIGxhc3QgdHlwZSBzZWVuCiAgICAgIyBh bmQgY29tcGxhaW5zIGlmIHRoZSBoZWFkZXIgdHlwZXMgYXJlIG91dCBvZiBvcmRlciBvciBtaXNz aW5nLgotICAgIGVycm9yX21lc3NhZ2UgPSBpbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVk ZV9vcmRlcihoZWFkZXJfdHlwZSwgZmlsZV9leHRlbnNpb24gPT0gImgiKQorICAgIGhlYWRlcl90 eXBlID0gaW5jbHVkZV9zdGF0ZS5oZWFkZXJfdHlwZXNbbGluZV9udW1iZXJdCisgICAgZXJyb3Jf bWVzc2FnZSA9IGluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGhlYWRlcl90 eXBlLCBmaWxlX2V4dGVuc2lvbiA9PSAiaCIsIGluY2x1ZGVfc3RhdGUpCiAKICAgICAjIENoZWNr IHRvIG1ha2Ugc3VyZSB3ZSBoYXZlIGEgYmxhbmsgbGluZSBhZnRlciBwcmltYXJ5IGhlYWRlci4K ICAgICBpZiBub3QgZXJyb3JfbWVzc2FnZSBhbmQgaGVhZGVyX3R5cGUgPT0gX1BSSU1BUllfSEVB REVSOgpAQCAtMjIyNCw4ICsyMjI2LDcgQEAgZGVmIGNoZWNrX2xhbmd1YWdlKGZpbGVuYW1lLCBj bGVhbl9saW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5zaW9uLCBpbmNsdWRlX3MKICAgICBp ZiBub3QgbGluZToKICAgICAgICAgcmV0dXJuCiAKLSAgICBtYXRjaGVkID0gX1JFX1BBVFRFUk5f SU5DTFVERS5zZWFyY2gobGluZSkKLSAgICBpZiBtYXRjaGVkOgorICAgIGlmIGxpbmVfbnVtYmVy IGluIGluY2x1ZGVfc3RhdGUuaGVhZGVyX3R5cGVzOgogICAgICAgICBjaGVja19pbmNsdWRlX2xp bmUoZmlsZW5hbWUsIGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGlu Y2x1ZGVfc3RhdGUsIGVycm9yKQogICAgICAgICByZXR1cm4KIApAQCAtMjg3MCw2ICsyODcxLDE5 IEBAIGRlZiBfcHJvY2Vzc19saW5lcyhmaWxlbmFtZSwgZmlsZV9leHRlbnNpb24sIGxpbmVzLCBl cnJvciwgbWluX2NvbmZpZGVuY2UpOgogCiAgICAgcmVtb3ZlX211bHRpX2xpbmVfY29tbWVudHMo bGluZXMsIGVycm9yKQogICAgIGNsZWFuX2xpbmVzID0gQ2xlYW5zZWRMaW5lcyhsaW5lcykKKwor ICAgIGlmIGZpbGVfZXh0ZW5zaW9uICE9ICdoJzoKKyAgICAgICAgZm9yIGxpbmVfbnVtYmVyIGlu IHhyYW5nZShjbGVhbl9saW5lcy5udW1fbGluZXMoKSk6CisgICAgICAgICAgICBsaW5lID0gY2xl YW5fbGluZXMuZWxpZGVkW2xpbmVfbnVtYmVyXQorICAgICAgICAgICAgbWF0Y2hlZCA9IF9SRV9Q QVRURVJOX0lOQ0xVREUuc2VhcmNoKGxpbmUpCisgICAgICAgICAgICBpZiBtYXRjaGVkOgorICAg ICAgICAgICAgICAgIGluY2x1ZGUgPSBtYXRjaGVkLmdyb3VwKDIpCisgICAgICAgICAgICAgICAg aXNfc3lzdGVtID0gKG1hdGNoZWQuZ3JvdXAoMSkgPT0gJzwnKQorICAgICAgICAgICAgICAgIGhl YWRlcl90eXBlID0gX2NsYXNzaWZ5X2luY2x1ZGUoZmlsZW5hbWUsIGluY2x1ZGUsIGlzX3N5c3Rl bSwgaW5jbHVkZV9zdGF0ZSkKKyAgICAgICAgICAgICAgICBpbmNsdWRlX3N0YXRlLmhlYWRlcl90 eXBlc1tsaW5lX251bWJlcl0gPSBoZWFkZXJfdHlwZQorICAgICAgICAgICAgICAgIGlmIGhlYWRl cl90eXBlID09IF9QUklNQVJZX0hFQURFUjoKKyAgICAgICAgICAgICAgICAgICAgaW5jbHVkZV9z dGF0ZS5faGFzX3ByaW1hcnlfaGVhZGVyID0gVHJ1ZQorCiAgICAgZm9yIGxpbmUgaW4geHJhbmdl KGNsZWFuX2xpbmVzLm51bV9saW5lcygpKToKICAgICAgICAgcHJvY2Vzc19saW5lKGZpbGVuYW1l LCBmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmUsCiAgICAgICAgICAgICAgICAgICAg ICBpbmNsdWRlX3N0YXRlLCBmdW5jdGlvbl9zdGF0ZSwgY2xhc3Nfc3RhdGUsIGZpbGVfc3RhdGUs IGVycm9yKQo= 57968 2010-06-05 10:36:45 -0700 2010-06-11 08:25:02 -0700 Patch bug-39514-20100605103749.patch text/plain 5077 agbakken ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjYzc3NTMwNjBhYTcwYmRjZDk1ZjI4NzZhNWU1NmJhNDFlODNiZDkzLi42NjQzM2Jl YTU4ODk2MTRiNGVmZjZlMGQwYzc2MmMwMjk5Y2FkM2UwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTAtMDYtMDUgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFpbC5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY2hlY2std2Via2l0LXN0 eWxlIHNob3VsZG4ndCBjb21wbGFpbiBhYm91dCBub3QgaW5jbHVkaW5nIGEgcHJpbWFyeSBoZWFk ZXIgZmlsZSBpZiBub25lIGV4aXN0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5NTE0CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NwcC5weToKKwogMjAxMC0wNi0wNCAgVG9ueSBHZW50aWxjb3JlICA8dG9ueWdA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CmluZGV4 IGE3N2JmZjA4ODBmYzQ2ZmQ4NWVlYzEzNjE1ZTUzMzY4NWI2ODE3YTcuLmZjMThhM2M0MzUzZDc4 MDcyYTc1M2NmNjFkNjc2N2JlYTFkM2UwZGQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBAIC0yMTIsMTIgKzIxMiwxNiBAQCBj bGFzcyBfSW5jbHVkZVN0YXRlKGRpY3QpOgogICAgICAgICBkaWN0Ll9faW5pdF9fKHNlbGYpCiAg ICAgICAgIHNlbGYuX3NlY3Rpb24gPSBzZWxmLl9JTklUSUFMX1NFQ1RJT04KICAgICAgICAgc2Vs Zi5fdmlzaXRlZF9wcmltYXJ5X3NlY3Rpb24gPSBGYWxzZQorICAgICAgICBzZWxmLl9oYXNfcHJp bWFyeV9oZWFkZXIgPSBGYWxzZQogICAgICAgICBzZWxmLmhlYWRlcl90eXBlcyA9IGRpY3QoKTsK IAogICAgIGRlZiB2aXNpdGVkX3ByaW1hcnlfc2VjdGlvbihzZWxmKToKICAgICAgICAgcmV0dXJu IHNlbGYuX3Zpc2l0ZWRfcHJpbWFyeV9zZWN0aW9uCiAKLSAgICBkZWYgY2hlY2tfbmV4dF9pbmNs dWRlX29yZGVyKHNlbGYsIGhlYWRlcl90eXBlLCBmaWxlX2lzX2hlYWRlcik6CisgICAgZGVmIGhh c19wcmltYXJ5X2hlYWRlcihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX2hhc19wcmltYXJ5 X2hlYWRlcgorCisgICAgZGVmIGNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihzZWxmLCBoZWFkZXJf dHlwZSwgZmlsZV9pc19oZWFkZXIsIGluY2x1ZGVfc3RhdGUpOgogICAgICAgICAiIiJSZXR1cm5z IGEgbm9uLWVtcHR5IGVycm9yIG1lc3NhZ2UgaWYgdGhlIG5leHQgaGVhZGVyIGlzIG91dCBvZiBv cmRlci4KIAogICAgICAgICBUaGlzIGZ1bmN0aW9uIGFsc28gdXBkYXRlcyB0aGUgaW50ZXJuYWwg c3RhdGUgdG8gYmUgcmVhZHkgdG8gY2hlY2sKQEAgLTI2MSw3ICsyNjUsNyBAQCBjbGFzcyBfSW5j bHVkZVN0YXRlKGRpY3QpOgogICAgICAgICAgICAgc2VsZi5fdmlzaXRlZF9wcmltYXJ5X3NlY3Rp b24gPSBUcnVlCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBhc3NlcnQgaGVhZGVyX3R5cGUg PT0gX09USEVSX0hFQURFUgotICAgICAgICAgICAgaWYgbm90IGZpbGVfaXNfaGVhZGVyIGFuZCBz ZWxmLl9zZWN0aW9uIDwgc2VsZi5fUFJJTUFSWV9TRUNUSU9OOgorICAgICAgICAgICAgaWYgbm90 IGZpbGVfaXNfaGVhZGVyIGFuZCBzZWxmLl9zZWN0aW9uIDwgc2VsZi5fUFJJTUFSWV9TRUNUSU9O IGFuZCBpbmNsdWRlX3N0YXRlLmhhc19wcmltYXJ5X2hlYWRlcigpOgogICAgICAgICAgICAgICAg IGVycm9yX21lc3NhZ2UgPSBiZWZvcmVfZXJyb3JfbWVzc2FnZQogICAgICAgICAgICAgc2VsZi5f c2VjdGlvbiA9IHNlbGYuX09USEVSX1NFQ1RJT04KIApAQCAtMjEyNywxMSArMjEzMSwxMSBAQCBk ZWYgY2hlY2tfaW5jbHVkZV9saW5lKGZpbGVuYW1lLCBmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGlu ZXMsIGxpbmVfbnVtYmVyLCBpbmNsdQogICAgICMgICAgICAgIG1heSBpbnZvbHZlIGhhdmluZyB0 aGUgZXJyb3IgaGFuZGxlciBjbGFzc2VzIGV4cG9zZSBhCiAgICAgIyAgICAgICAgc2hvdWxkX2No ZWNrKCkgbWV0aG9kLCBpbiBhZGRpdGlvbiB0byB0aGUgdXN1YWwgX19jYWxsX18KICAgICAjICAg ICAgICBtZXRob2QuCisgICAgYXNzZXJ0IGxpbmVfbnVtYmVyIGluIGluY2x1ZGVfc3RhdGUuaGVh ZGVyX3R5cGVzCiAgICAgbGluZSA9IGNsZWFuX2xpbmVzLmxpbmVzW2xpbmVfbnVtYmVyXQogCiAg ICAgbWF0Y2hlZCA9IF9SRV9QQVRURVJOX0lOQ0xVREUuc2VhcmNoKGxpbmUpCi0gICAgaWYgbm90 IG1hdGNoZWQ6Ci0gICAgICAgIHJldHVybgorICAgIGFzc2VydCBtYXRjaGVkCiAKICAgICBpbmNs dWRlID0gbWF0Y2hlZC5ncm91cCgyKQogICAgIGlzX3N5c3RlbSA9IChtYXRjaGVkLmdyb3VwKDEp ID09ICc8JykKQEAgLTIxNTQsOSArMjE1OCw2IEBAIGRlZiBjaGVja19pbmNsdWRlX2xpbmUoZmls ZW5hbWUsIGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGluY2x1CiAg ICAgZWxzZToKICAgICAgICAgaW5jbHVkZV9zdGF0ZVtpbmNsdWRlXSA9IGxpbmVfbnVtYmVyCiAK LSAgICBoZWFkZXJfdHlwZSA9IF9jbGFzc2lmeV9pbmNsdWRlKGZpbGVuYW1lLCBpbmNsdWRlLCBp c19zeXN0ZW0sIGluY2x1ZGVfc3RhdGUpCi0gICAgaW5jbHVkZV9zdGF0ZS5oZWFkZXJfdHlwZXNb bGluZV9udW1iZXJdID0gaGVhZGVyX3R5cGUKLQogICAgICMgT25seSBwcm9jZWVkIGlmIHRoaXMg aXNuJ3QgYSBkdXBsaWNhdGUgaGVhZGVyLgogICAgIGlmIGR1cGxpY2F0ZV9oZWFkZXI6CiAgICAg ICAgIHJldHVybgpAQCAtMjE2Niw3ICsyMTY3LDggQEAgZGVmIGNoZWNrX2luY2x1ZGVfbGluZShm aWxlbmFtZSwgZmlsZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgaW5jbHUK ICAgICAjIDIpIGZvciBoZWFkZXIgZmlsZXM6IGFscGhhYmV0aWNhbGx5IHNvcnRlZAogICAgICMg VGhlIGluY2x1ZGVfc3RhdGUgb2JqZWN0IGtlZXBzIHRyYWNrIG9mIHRoZSBsYXN0IHR5cGUgc2Vl bgogICAgICMgYW5kIGNvbXBsYWlucyBpZiB0aGUgaGVhZGVyIHR5cGVzIGFyZSBvdXQgb2Ygb3Jk ZXIgb3IgbWlzc2luZy4KLSAgICBlcnJvcl9tZXNzYWdlID0gaW5jbHVkZV9zdGF0ZS5jaGVja19u ZXh0X2luY2x1ZGVfb3JkZXIoaGVhZGVyX3R5cGUsIGZpbGVfZXh0ZW5zaW9uID09ICJoIikKKyAg ICBoZWFkZXJfdHlwZSA9IGluY2x1ZGVfc3RhdGUuaGVhZGVyX3R5cGVzW2xpbmVfbnVtYmVyXQor ICAgIGVycm9yX21lc3NhZ2UgPSBpbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRl cihoZWFkZXJfdHlwZSwgZmlsZV9leHRlbnNpb24gPT0gImgiLCBpbmNsdWRlX3N0YXRlKQogCiAg ICAgIyBDaGVjayB0byBtYWtlIHN1cmUgd2UgaGF2ZSBhIGJsYW5rIGxpbmUgYWZ0ZXIgcHJpbWFy eSBoZWFkZXIuCiAgICAgaWYgbm90IGVycm9yX21lc3NhZ2UgYW5kIGhlYWRlcl90eXBlID09IF9Q UklNQVJZX0hFQURFUjoKQEAgLTIyMjQsOCArMjIyNiw3IEBAIGRlZiBjaGVja19sYW5ndWFnZShm aWxlbmFtZSwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBmaWxlX2V4dGVuc2lvbiwgaW5jbHVk ZV9zCiAgICAgaWYgbm90IGxpbmU6CiAgICAgICAgIHJldHVybgogCi0gICAgbWF0Y2hlZCA9IF9S RV9QQVRURVJOX0lOQ0xVREUuc2VhcmNoKGxpbmUpCi0gICAgaWYgbWF0Y2hlZDoKKyAgICBpZiBs aW5lX251bWJlciBpbiBpbmNsdWRlX3N0YXRlLmhlYWRlcl90eXBlczoKICAgICAgICAgY2hlY2tf aW5jbHVkZV9saW5lKGZpbGVuYW1lLCBmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmVf bnVtYmVyLCBpbmNsdWRlX3N0YXRlLCBlcnJvcikKICAgICAgICAgcmV0dXJuCiAKQEAgLTI4NzAs NiArMjg3MSwxOCBAQCBkZWYgX3Byb2Nlc3NfbGluZXMoZmlsZW5hbWUsIGZpbGVfZXh0ZW5zaW9u LCBsaW5lcywgZXJyb3IsIG1pbl9jb25maWRlbmNlKToKIAogICAgIHJlbW92ZV9tdWx0aV9saW5l X2NvbW1lbnRzKGxpbmVzLCBlcnJvcikKICAgICBjbGVhbl9saW5lcyA9IENsZWFuc2VkTGluZXMo bGluZXMpCisKKyAgICBmb3IgbGluZV9udW1iZXIgaW4geHJhbmdlKGNsZWFuX2xpbmVzLm51bV9s aW5lcygpKToKKyAgICAgICAgbGluZSA9IGNsZWFuX2xpbmVzLmVsaWRlZFtsaW5lX251bWJlcl0K KyAgICAgICAgbWF0Y2hlZCA9IF9SRV9QQVRURVJOX0lOQ0xVREUuc2VhcmNoKGxpbmUpCisgICAg ICAgIGlmIG1hdGNoZWQ6CisgICAgICAgICAgICBpbmNsdWRlID0gbWF0Y2hlZC5ncm91cCgyKQor ICAgICAgICAgICAgaXNfc3lzdGVtID0gKG1hdGNoZWQuZ3JvdXAoMSkgPT0gJzwnKQorICAgICAg ICAgICAgaGVhZGVyX3R5cGUgPSBfY2xhc3NpZnlfaW5jbHVkZShmaWxlbmFtZSwgaW5jbHVkZSwg aXNfc3lzdGVtLCBpbmNsdWRlX3N0YXRlKQorICAgICAgICAgICAgaW5jbHVkZV9zdGF0ZS5oZWFk ZXJfdHlwZXNbbGluZV9udW1iZXJdID0gaGVhZGVyX3R5cGUKKyAgICAgICAgICAgIGlmIGhlYWRl cl90eXBlID09IF9QUklNQVJZX0hFQURFUjoKKyAgICAgICAgICAgICAgICBpbmNsdWRlX3N0YXRl Ll9oYXNfcHJpbWFyeV9oZWFkZXIgPSBUcnVlCisKICAgICBmb3IgbGluZSBpbiB4cmFuZ2UoY2xl YW5fbGluZXMubnVtX2xpbmVzKCkpOgogICAgICAgICBwcm9jZXNzX2xpbmUoZmlsZW5hbWUsIGZp bGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZSwKICAgICAgICAgICAgICAgICAgICAgIGlu Y2x1ZGVfc3RhdGUsIGZ1bmN0aW9uX3N0YXRlLCBjbGFzc19zdGF0ZSwgZmlsZV9zdGF0ZSwgZXJy b3IpCg== 89691 2011-04-14 17:14:35 -0700 2011-04-14 17:36:37 -0700 Simple fix 39514.patch text/plain 9328 dslomov ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1Yjli OWI4Li4zZjJmNGRjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMTQgIERtaXRyeSBMb21vdiAgPGRzbG9t b3ZAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBjaGVjay13ZWJraXQtc3R5bGUgc2hvdWxkbid0IGNvbXBsYWluIGFib3V0IG5vdCBp bmNsdWRpbmcgYSBwcmltYXJ5IGhlYWRlciBmaWxlIAorICAgICAgICBpZiBub25lIGV4aXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk1MTQKKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OgorCiAy MDExLTA0LTE0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwLnB5CmluZGV4IDdmOGE5ZWEuLjU4N2RjMzUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBAIC0zMTIsNyArMzEyLDcgQEAgY2xh c3MgX0luY2x1ZGVTdGF0ZShkaWN0KToKICAgICBkZWYgdmlzaXRlZF9wcmltYXJ5X3NlY3Rpb24o c2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl92aXNpdGVkX3ByaW1hcnlfc2VjdGlvbgogCi0g ICAgZGVmIGNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihzZWxmLCBoZWFkZXJfdHlwZSwgZmlsZV9p c19oZWFkZXIpOgorICAgIGRlZiBjaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoc2VsZiwgaGVhZGVy X3R5cGUsIGZpbGVfaXNfaGVhZGVyLCBoYXNfcHJpbWFyeV9oZWFkZXIpOgogICAgICAgICAiIiJS ZXR1cm5zIGEgbm9uLWVtcHR5IGVycm9yIG1lc3NhZ2UgaWYgdGhlIG5leHQgaGVhZGVyIGlzIG91 dCBvZiBvcmRlci4KIAogICAgICAgICBUaGlzIGZ1bmN0aW9uIGFsc28gdXBkYXRlcyB0aGUgaW50 ZXJuYWwgc3RhdGUgdG8gYmUgcmVhZHkgdG8gY2hlY2sKQEAgLTM1Nyw3ICszNTcsOCBAQCBjbGFz cyBfSW5jbHVkZVN0YXRlKGRpY3QpOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgYXNzZXJ0 IGhlYWRlcl90eXBlID09IF9PVEhFUl9IRUFERVIKICAgICAgICAgICAgIGlmIG5vdCBmaWxlX2lz X2hlYWRlciBhbmQgc2VsZi5fc2VjdGlvbiA8IHNlbGYuX1BSSU1BUllfU0VDVElPTjoKLSAgICAg ICAgICAgICAgICBlcnJvcl9tZXNzYWdlID0gYmVmb3JlX2Vycm9yX21lc3NhZ2UKKyAgICAgICAg ICAgICAgICBpZiBoYXNfcHJpbWFyeV9oZWFkZXI6CisgICAgICAgICAgICAgICAgICAgIGVycm9y X21lc3NhZ2UgPSBiZWZvcmVfZXJyb3JfbWVzc2FnZQogICAgICAgICAgICAgc2VsZi5fc2VjdGlv biA9IHNlbGYuX09USEVSX1NFQ1RJT04KIAogICAgICAgICByZXR1cm4gZXJyb3JfbWVzc2FnZQpA QCAtMjU5Niw2ICsyNTk3LDE4IEBAIGRlZiBfY2xhc3NpZnlfaW5jbHVkZShmaWxlbmFtZSwgaW5j bHVkZSwgaXNfc3lzdGVtLCBpbmNsdWRlX3N0YXRlKToKIAogICAgIHJldHVybiBfT1RIRVJfSEVB REVSCiAKK2RlZiBfaGFzX3ByaW1hcnlfaGVhZGVyKGZpbGVuYW1lKToKKyAgICAiIiJSZXR1cm4g YSBwcmltYXJ5IGhlYWRlciBmaWxlIG5hbWUgZm9yIGEgZmlsZSwgb3IgZW1wdHkgc3RyaW5nIAor ICAgIGlmIHRoZSBmaWxlIGlzIG5vdCBzb3VyY2UgZmlsZSBvciBwcmltYXJ5IGhlYWRlciBkb2Vz IG5vdCBleGlzdAorICAgICIiIgorICAgIGZpbGVpbmZvID0gRmlsZUluZm8oZmlsZW5hbWUpCisg ICAgaWYgbm90IGZpbGVpbmZvLmlzX3NvdXJjZSgpIDoKKyAgICAgICAgcmV0dXJuIEZhbHNlCisg ICAgcHJpbWFyeV9oZWFkZXIgPSBmaWxlaW5mby5ub19leHRlbnNpb24oKSArICIuaCIKKyAgICBp ZiBvcy5wYXRoLmlzZmlsZShwcmltYXJ5X2hlYWRlcik6CisgICAgICAgIHJldHVybiBUcnVlCisg ICAgcmV0dXJuIEZhbHNlCisKIAogZGVmIGNoZWNrX2luY2x1ZGVfbGluZShmaWxlbmFtZSwgZmls ZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgaW5jbHVkZV9zdGF0ZSwgZXJy b3IpOgogICAgICIiIkNoZWNrIHJ1bGVzIHRoYXQgYXJlIGFwcGxpY2FibGUgdG8gI2luY2x1ZGUg bGluZXMuCkBAIC0yNjQ2LDYgKzI2NTksNyBAQCBkZWYgY2hlY2tfaW5jbHVkZV9saW5lKGZpbGVu YW1lLCBmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBpbmNsdQogICAg ICAgICBpbmNsdWRlX3N0YXRlW2luY2x1ZGVdID0gbGluZV9udW1iZXIKIAogICAgIGhlYWRlcl90 eXBlID0gX2NsYXNzaWZ5X2luY2x1ZGUoZmlsZW5hbWUsIGluY2x1ZGUsIGlzX3N5c3RlbSwgaW5j bHVkZV9zdGF0ZSkKKyAgICBoYXNfcHJpbWFyeV9oZWFkZXIgPSBfaGFzX3ByaW1hcnlfaGVhZGVy KGZpbGVuYW1lKQogICAgIGluY2x1ZGVfc3RhdGUuaGVhZGVyX3R5cGVzW2xpbmVfbnVtYmVyXSA9 IGhlYWRlcl90eXBlCiAKICAgICAjIE9ubHkgcHJvY2VlZCBpZiB0aGlzIGlzbid0IGEgZHVwbGlj YXRlIGhlYWRlci4KQEAgLTI2NTcsNyArMjY3MSw3IEBAIGRlZiBjaGVja19pbmNsdWRlX2xpbmUo ZmlsZW5hbWUsIGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGluY2x1 CiAgICAgIyAyKSBmb3IgaGVhZGVyIGZpbGVzOiBhbHBoYWJldGljYWxseSBzb3J0ZWQKICAgICAj IFRoZSBpbmNsdWRlX3N0YXRlIG9iamVjdCBrZWVwcyB0cmFjayBvZiB0aGUgbGFzdCB0eXBlIHNl ZW4KICAgICAjIGFuZCBjb21wbGFpbnMgaWYgdGhlIGhlYWRlciB0eXBlcyBhcmUgb3V0IG9mIG9y ZGVyIG9yIG1pc3NpbmcuCi0gICAgZXJyb3JfbWVzc2FnZSA9IGluY2x1ZGVfc3RhdGUuY2hlY2tf bmV4dF9pbmNsdWRlX29yZGVyKGhlYWRlcl90eXBlLCBmaWxlX2V4dGVuc2lvbiA9PSAiaCIpCisg ICAgZXJyb3JfbWVzc2FnZSA9IGluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVy KGhlYWRlcl90eXBlLCBmaWxlX2V4dGVuc2lvbiA9PSAiaCIsIGhhc19wcmltYXJ5X2hlYWRlcikK IAogICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJlIHdlIGhhdmUgYSBibGFuayBsaW5lIGFmdGVyIHBy aW1hcnkgaGVhZGVyLgogICAgIGlmIG5vdCBlcnJvcl9tZXNzYWdlIGFuZCBoZWFkZXJfdHlwZSA9 PSBfUFJJTUFSWV9IRUFERVI6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CmluZGV4IDJkMmFiYmYuLjYzYWRiZDQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0 ZXN0LnB5CkBAIC0yNDUyLDE4ICsyNDUyLDIwIEBAIGNsYXNzIE9yZGVyT2ZJbmNsdWRlc1Rlc3Qo Q3BwU3R5bGVUZXN0QmFzZSk6CiAKICAgICAgICAgIyBDaGVhdCBvcy5wYXRoLmFic3BhdGggY2Fs bGVkIGluIEZpbGVJbmZvIGNsYXNzLgogICAgICAgICBzZWxmLm9zX3BhdGhfYWJzcGF0aF9vcmln ID0gb3MucGF0aC5hYnNwYXRoCisgICAgICAgIHNlbGYub3NfcGF0aF9pc2ZpbGVfb3JpZyA9IG9z LnBhdGguaXNmaWxlCiAgICAgICAgIG9zLnBhdGguYWJzcGF0aCA9IGxhbWJkYSB2YWx1ZTogdmFs dWUKIAogICAgIGRlZiB0ZWFyRG93bihzZWxmKToKICAgICAgICAgb3MucGF0aC5hYnNwYXRoID0g c2VsZi5vc19wYXRoX2Fic3BhdGhfb3JpZworICAgICAgICBvcy5wYXRoLmlzZmlsZSA9IHNlbGYu b3NfcGF0aF9pc2ZpbGVfb3JpZwogCiAgICAgZGVmIHRlc3RfY2hlY2tfbmV4dF9pbmNsdWRlX29y ZGVyX19ub19jb25maWcoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0hlYWRlciBm aWxlIHNob3VsZCBub3QgY29udGFpbiBXZWJDb3JlIGNvbmZpZy5oLicsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihj cHBfc3R5bGUuX0NPTkZJR19IRUFERVIsIFRydWUpKQorICAgICAgICAgICAgICAgICAgICAgICAg IHNlbGYuaW5jbHVkZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0eWxlLl9D T05GSUdfSEVBREVSLCBUcnVlLCBUcnVlKSkKIAogICAgIGRlZiB0ZXN0X2NoZWNrX25leHRfaW5j bHVkZV9vcmRlcl9fbm9fc2VsZihzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnSGVh ZGVyIGZpbGUgc2hvdWxkIG5vdCBjb250YWluIGl0c2VsZi4nLAotICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYuaW5jbHVkZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0 eWxlLl9QUklNQVJZX0hFQURFUiwgVHJ1ZSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgc2Vs Zi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX1BSSU1B UllfSEVBREVSLCBUcnVlLCBUcnVlKSkKICAgICAgICAgIyBUZXN0IGFjdHVhbCBjb2RlIHRvIG1h a2Ugc3VyZSB0aGF0IGhlYWRlciB0eXBlcyBhcmUgY29ycmVjdGx5IGFzc2lnbmVkLgogICAgICAg ICBzZWxmLmFzc2VydF9sYW5ndWFnZV9ydWxlc19jaGVjaygnRm9vLmgnLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgIkZvby5oIlxuJywKQEAgLTI0 NzUsMjIgKzI0NzcsMjIgQEAgY2xhc3MgT3JkZXJPZkluY2x1ZGVzVGVzdChDcHBTdHlsZVRlc3RC YXNlKToKIAogICAgIGRlZiB0ZXN0X2NoZWNrX25leHRfaW5jbHVkZV9vcmRlcl9fbGlrZWx5X3Ro ZW5fY29uZmlnKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdGb3VuZCBoZWFkZXIg dGhpcyBmaWxlIGltcGxlbWVudHMgYmVmb3JlIFdlYkNvcmUgY29uZmlnLmguJywKLSAgICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29y ZGVyKGNwcF9zdHlsZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGNwcF9z dHlsZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlLCBUcnVlKSkKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbCgnRm91bmQgV2ViQ29yZSBjb25maWcuaCBhZnRlciBhIGhlYWRlciB0aGlzIGZpbGUgaW1w bGVtZW50cy4nLAotICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuaW5jbHVkZV9zdGF0ZS5j aGVja19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0eWxlLl9DT05GSUdfSEVBREVSLCBGYWxzZSkp CisgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRf aW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX0NPTkZJR19IRUFERVIsIEZhbHNlLCBUcnVlKSkKIAog ICAgIGRlZiB0ZXN0X2NoZWNrX25leHRfaW5jbHVkZV9vcmRlcl9fb3RoZXJfdGhlbl9jb25maWco c2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0ZvdW5kIG90aGVyIGhlYWRlciBiZWZv cmUgV2ViQ29yZSBjb25maWcuaC4nLAotICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuaW5j bHVkZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0eWxlLl9PVEhFUl9IRUFE RVIsIEZhbHNlKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUu Y2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGNwcF9zdHlsZS5fT1RIRVJfSEVBREVSLCBGYWxzZSwg VHJ1ZSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0ZvdW5kIFdlYkNvcmUgY29uZmlnLmgg YWZ0ZXIgb3RoZXIgaGVhZGVyLicsCi0gICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5pbmNs dWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX0NPTkZJR19IRUFE RVIsIEZhbHNlKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUu Y2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGNwcF9zdHlsZS5fQ09ORklHX0hFQURFUiwgRmFsc2Us IFRydWUpKQogCiAgICAgZGVmIHRlc3RfY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyX19jb25maWdf dGhlbl9vdGhlcl90aGVuX2xpa2VseShzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgn Jywgc2VsZi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUu X0NPTkZJR19IRUFERVIsIEZhbHNlKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgc2Vs Zi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX0NPTkZJ R19IRUFERVIsIEZhbHNlLCBUcnVlKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnRm91bmQg b3RoZXIgaGVhZGVyIGJlZm9yZSBhIGhlYWRlciB0aGlzIGZpbGUgaW1wbGVtZW50cy4nLAotICAg ICAgICAgICAgICAgICAgICAgICAgIHNlbGYuaW5jbHVkZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1 ZGVfb3JkZXIoY3BwX3N0eWxlLl9PVEhFUl9IRUFERVIsIEZhbHNlKSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGNw cF9zdHlsZS5fT1RIRVJfSEVBREVSLCBGYWxzZSwgVHJ1ZSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoJ0ZvdW5kIGhlYWRlciB0aGlzIGZpbGUgaW1wbGVtZW50cyBhZnRlciBvdGhlciBoZWFk ZXIuJywKLSAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tf bmV4dF9pbmNsdWRlX29yZGVyKGNwcF9zdHlsZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNs dWRlX29yZGVyKGNwcF9zdHlsZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlLCBUcnVlKSkKIAogICAg IGRlZiB0ZXN0X2NoZWNrX2FscGhhYmV0aWNhbF9pbmNsdWRlX29yZGVyKHNlbGYpOgogICAgICAg ICBzZWxmLmFzc2VydF9sYW5ndWFnZV9ydWxlc19jaGVjaygnZm9vLmgnLApAQCAtMjU4Niw2ICsy NTg4LDM0IEBAIGNsYXNzIE9yZGVyT2ZJbmNsdWRlc1Rlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5jbHVkZSAiZy5oIlxu JywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyJmb28uaCIgYWxy ZWFkeSBpbmNsdWRlZCBhdCBmb28uY3BwOjIgIFtidWlsZC9pbmNsdWRlXSBbNF0nKQogCisgICAg ZGVmIHRlc3RfcHJpbWFyeV9oZWFkZXIoc2VsZik6CisgICAgICAgICMgRmlsZSB3aXRoIG5vbi1l eGlzdGluZyBwcmltYXJ5IGhlYWRlciBzaG91bGQgbm90IHByb2R1Y2UgZXJyb3JzCisgICAgICAg IHNlbGYuYXNzZXJ0X2xhbmd1YWdlX3J1bGVzX2NoZWNrKCdmb28uY3BwJywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNpbmNsdWRlICJjb25maWcuaCJcbicKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1xuJworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgImJhci5oIlxuJywKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJycpCisgICAgICAgICMgUHJldGVu ZCB0aGF0IGhlYWRlciBmaWxlcyBleGlzdAorICAgICAgICBvcy5wYXRoLmlzZmlsZSA9IGxhbWJk YSBmaWxlbmFtZTogVHJ1ZQorICAgICAgICAjIE1pc3NpbmcgaW5jbHVkZSBmb3IgZXhpc3Rpbmcg cHJpbWFyeSBoZWFkZXIgLT4gZXJyb3IKKyAgICAgICAgc2VsZi5hc3NlcnRfbGFuZ3VhZ2VfcnVs ZXNfY2hlY2soJ2Zvby5jcHAnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnI2luY2x1ZGUgImNvbmZpZy5oIlxuJworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnXG4nCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICcjaW5jbHVkZSAiYmFyLmgiXG4nLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnRm91bmQgb3RoZXIgaGVhZGVyIGJlZm9yZSBhIGhlYWRlciB0aGlzIGZpbGUg aW1wbGVtZW50cy4gJworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn U2hvdWxkIGJlOiBjb25maWcuaCwgcHJpbWFyeSBoZWFkZXIsIGJsYW5rIGxpbmUsIGFuZCB0aGVu ICcKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2FscGhhYmV0aWNh bGx5IHNvcnRlZC4gIFtidWlsZC9pbmNsdWRlX29yZGVyXSBbNF0nKQorICAgICAgICAjIEhhdmlu ZyBpbmNsdWRlIGZvciBleGlzdGluZyBwcmltYXJ5IGhlYWRlciAtPiBubyBlcnJvcgorICAgICAg ICBzZWxmLmFzc2VydF9sYW5ndWFnZV9ydWxlc19jaGVjaygnZm9vLmNwcCcsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5jbHVkZSAiY29uZmlnLmgiXG4nCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5jbHVkZSAiZm9vLmgi XG4nCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdcbicKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNpbmNsdWRlICJiYXIuaCJcbics CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcnKQorICAKKyAgICAg ICAgb3MucGF0aC5pc2ZpbGUgPSBzZWxmLm9zX3BhdGhfaXNmaWxlX29yaWcKKworCiAgICAgZGVm IHRlc3RfY2hlY2tfd3RmX2luY2x1ZGVzKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydF9sYW5n dWFnZV9ydWxlc19jaGVjaygnZm9vLmNwcCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICcjaW5jbHVkZSAiY29uZmlnLmgiXG4nCg== 89701 2011-04-14 17:36:14 -0700 2011-04-15 08:40:04 -0700 Simple fix + CR addressed 39514.patch text/plain 9441 dslomov ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1Yjli OWI4Li4zZjJmNGRjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMTQgIERtaXRyeSBMb21vdiAgPGRzbG9t b3ZAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBjaGVjay13ZWJraXQtc3R5bGUgc2hvdWxkbid0IGNvbXBsYWluIGFib3V0IG5vdCBp bmNsdWRpbmcgYSBwcmltYXJ5IGhlYWRlciBmaWxlIAorICAgICAgICBpZiBub25lIGV4aXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk1MTQKKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OgorCiAy MDExLTA0LTE0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwLnB5CmluZGV4IDdmOGE5ZWEuLjBhMGRiNTQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBAIC0zMTIsNyArMzEyLDcgQEAgY2xh c3MgX0luY2x1ZGVTdGF0ZShkaWN0KToKICAgICBkZWYgdmlzaXRlZF9wcmltYXJ5X3NlY3Rpb24o c2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl92aXNpdGVkX3ByaW1hcnlfc2VjdGlvbgogCi0g ICAgZGVmIGNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihzZWxmLCBoZWFkZXJfdHlwZSwgZmlsZV9p c19oZWFkZXIpOgorICAgIGRlZiBjaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoc2VsZiwgaGVhZGVy X3R5cGUsIGZpbGVfaXNfaGVhZGVyLCBwcmltYXJ5X2hlYWRlcl9leGlzdHMpOgogICAgICAgICAi IiJSZXR1cm5zIGEgbm9uLWVtcHR5IGVycm9yIG1lc3NhZ2UgaWYgdGhlIG5leHQgaGVhZGVyIGlz IG91dCBvZiBvcmRlci4KIAogICAgICAgICBUaGlzIGZ1bmN0aW9uIGFsc28gdXBkYXRlcyB0aGUg aW50ZXJuYWwgc3RhdGUgdG8gYmUgcmVhZHkgdG8gY2hlY2sKQEAgLTM1Nyw3ICszNTcsOCBAQCBj bGFzcyBfSW5jbHVkZVN0YXRlKGRpY3QpOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgYXNz ZXJ0IGhlYWRlcl90eXBlID09IF9PVEhFUl9IRUFERVIKICAgICAgICAgICAgIGlmIG5vdCBmaWxl X2lzX2hlYWRlciBhbmQgc2VsZi5fc2VjdGlvbiA8IHNlbGYuX1BSSU1BUllfU0VDVElPTjoKLSAg ICAgICAgICAgICAgICBlcnJvcl9tZXNzYWdlID0gYmVmb3JlX2Vycm9yX21lc3NhZ2UKKyAgICAg ICAgICAgICAgICBpZiBwcmltYXJ5X2hlYWRlcl9leGlzdHM6CisgICAgICAgICAgICAgICAgICAg IGVycm9yX21lc3NhZ2UgPSBiZWZvcmVfZXJyb3JfbWVzc2FnZQogICAgICAgICAgICAgc2VsZi5f c2VjdGlvbiA9IHNlbGYuX09USEVSX1NFQ1RJT04KIAogICAgICAgICByZXR1cm4gZXJyb3JfbWVz c2FnZQpAQCAtMjU5Nyw2ICsyNTk4LDE3IEBAIGRlZiBfY2xhc3NpZnlfaW5jbHVkZShmaWxlbmFt ZSwgaW5jbHVkZSwgaXNfc3lzdGVtLCBpbmNsdWRlX3N0YXRlKToKICAgICByZXR1cm4gX09USEVS X0hFQURFUgogCiAKK2RlZiBfZG9lc19wcmltYXJ5X2hlYWRlcl9leGlzdChmaWxlbmFtZSk6Cisg ICAgIiIiUmV0dXJuIGEgcHJpbWFyeSBoZWFkZXIgZmlsZSBuYW1lIGZvciBhIGZpbGUsIG9yIGVt cHR5IHN0cmluZworICAgIGlmIHRoZSBmaWxlIGlzIG5vdCBzb3VyY2UgZmlsZSBvciBwcmltYXJ5 IGhlYWRlciBkb2VzIG5vdCBleGlzdC4KKyAgICAiIiIKKyAgICBmaWxlaW5mbyA9IEZpbGVJbmZv KGZpbGVuYW1lKQorICAgIGlmIG5vdCBmaWxlaW5mby5pc19zb3VyY2UoKToKKyAgICAgICAgcmV0 dXJuIEZhbHNlCisgICAgcHJpbWFyeV9oZWFkZXIgPSBmaWxlaW5mby5ub19leHRlbnNpb24oKSAr ICIuaCIKKyAgICByZXR1cm4gb3MucGF0aC5pc2ZpbGUocHJpbWFyeV9oZWFkZXIpCisKKwogZGVm IGNoZWNrX2luY2x1ZGVfbGluZShmaWxlbmFtZSwgZmlsZV9leHRlbnNpb24sIGNsZWFuX2xpbmVz LCBsaW5lX251bWJlciwgaW5jbHVkZV9zdGF0ZSwgZXJyb3IpOgogICAgICIiIkNoZWNrIHJ1bGVz IHRoYXQgYXJlIGFwcGxpY2FibGUgdG8gI2luY2x1ZGUgbGluZXMuCiAKQEAgLTI2NDYsNiArMjY1 OCw3IEBAIGRlZiBjaGVja19pbmNsdWRlX2xpbmUoZmlsZW5hbWUsIGZpbGVfZXh0ZW5zaW9uLCBj bGVhbl9saW5lcywgbGluZV9udW1iZXIsIGluY2x1CiAgICAgICAgIGluY2x1ZGVfc3RhdGVbaW5j bHVkZV0gPSBsaW5lX251bWJlcgogCiAgICAgaGVhZGVyX3R5cGUgPSBfY2xhc3NpZnlfaW5jbHVk ZShmaWxlbmFtZSwgaW5jbHVkZSwgaXNfc3lzdGVtLCBpbmNsdWRlX3N0YXRlKQorICAgIHByaW1h cnlfaGVhZGVyX2V4aXN0cyA9IF9kb2VzX3ByaW1hcnlfaGVhZGVyX2V4aXN0KGZpbGVuYW1lKQog ICAgIGluY2x1ZGVfc3RhdGUuaGVhZGVyX3R5cGVzW2xpbmVfbnVtYmVyXSA9IGhlYWRlcl90eXBl CiAKICAgICAjIE9ubHkgcHJvY2VlZCBpZiB0aGlzIGlzbid0IGEgZHVwbGljYXRlIGhlYWRlci4K QEAgLTI2NTcsNyArMjY3MCw5IEBAIGRlZiBjaGVja19pbmNsdWRlX2xpbmUoZmlsZW5hbWUsIGZp bGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGluY2x1CiAgICAgIyAyKSBm b3IgaGVhZGVyIGZpbGVzOiBhbHBoYWJldGljYWxseSBzb3J0ZWQKICAgICAjIFRoZSBpbmNsdWRl X3N0YXRlIG9iamVjdCBrZWVwcyB0cmFjayBvZiB0aGUgbGFzdCB0eXBlIHNlZW4KICAgICAjIGFu ZCBjb21wbGFpbnMgaWYgdGhlIGhlYWRlciB0eXBlcyBhcmUgb3V0IG9mIG9yZGVyIG9yIG1pc3Np bmcuCi0gICAgZXJyb3JfbWVzc2FnZSA9IGluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRl X29yZGVyKGhlYWRlcl90eXBlLCBmaWxlX2V4dGVuc2lvbiA9PSAiaCIpCisgICAgZXJyb3JfbWVz c2FnZSA9IGluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGhlYWRlcl90eXBl LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBmaWxlX2V4dGVuc2lvbiA9PSAiaCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaW1hcnlfaGVhZGVyX2V4aXN0cykKIAog ICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJlIHdlIGhhdmUgYSBibGFuayBsaW5lIGFmdGVyIHByaW1h cnkgaGVhZGVyLgogICAgIGlmIG5vdCBlcnJvcl9tZXNzYWdlIGFuZCBoZWFkZXJfdHlwZSA9PSBf UFJJTUFSWV9IRUFERVI6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NwcF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CmluZGV4IDJkMmFiYmYuLmE5OGQwZGQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0 LnB5CkBAIC0yNDUyLDE4ICsyNDUyLDIwIEBAIGNsYXNzIE9yZGVyT2ZJbmNsdWRlc1Rlc3QoQ3Bw U3R5bGVUZXN0QmFzZSk6CiAKICAgICAgICAgIyBDaGVhdCBvcy5wYXRoLmFic3BhdGggY2FsbGVk IGluIEZpbGVJbmZvIGNsYXNzLgogICAgICAgICBzZWxmLm9zX3BhdGhfYWJzcGF0aF9vcmlnID0g b3MucGF0aC5hYnNwYXRoCisgICAgICAgIHNlbGYub3NfcGF0aF9pc2ZpbGVfb3JpZyA9IG9zLnBh dGguaXNmaWxlCiAgICAgICAgIG9zLnBhdGguYWJzcGF0aCA9IGxhbWJkYSB2YWx1ZTogdmFsdWUK IAogICAgIGRlZiB0ZWFyRG93bihzZWxmKToKICAgICAgICAgb3MucGF0aC5hYnNwYXRoID0gc2Vs Zi5vc19wYXRoX2Fic3BhdGhfb3JpZworICAgICAgICBvcy5wYXRoLmlzZmlsZSA9IHNlbGYub3Nf cGF0aF9pc2ZpbGVfb3JpZwogCiAgICAgZGVmIHRlc3RfY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVy X19ub19jb25maWcoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0hlYWRlciBmaWxl IHNob3VsZCBub3QgY29udGFpbiBXZWJDb3JlIGNvbmZpZy5oLicsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgc2VsZi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBf c3R5bGUuX0NPTkZJR19IRUFERVIsIFRydWUpKQorICAgICAgICAgICAgICAgICAgICAgICAgIHNl bGYuaW5jbHVkZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0eWxlLl9DT05G SUdfSEVBREVSLCBUcnVlLCBUcnVlKSkKIAogICAgIGRlZiB0ZXN0X2NoZWNrX25leHRfaW5jbHVk ZV9vcmRlcl9fbm9fc2VsZihzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnSGVhZGVy IGZpbGUgc2hvdWxkIG5vdCBjb250YWluIGl0c2VsZi4nLAotICAgICAgICAgICAgICAgICAgICAg ICAgIHNlbGYuaW5jbHVkZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0eWxl Ll9QUklNQVJZX0hFQURFUiwgVHJ1ZSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5p bmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX1BSSU1BUllf SEVBREVSLCBUcnVlLCBUcnVlKSkKICAgICAgICAgIyBUZXN0IGFjdHVhbCBjb2RlIHRvIG1ha2Ug c3VyZSB0aGF0IGhlYWRlciB0eXBlcyBhcmUgY29ycmVjdGx5IGFzc2lnbmVkLgogICAgICAgICBz ZWxmLmFzc2VydF9sYW5ndWFnZV9ydWxlc19jaGVjaygnRm9vLmgnLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgIkZvby5oIlxuJywKQEAgLTI0NzUs MjIgKzI0NzcsMjIgQEAgY2xhc3MgT3JkZXJPZkluY2x1ZGVzVGVzdChDcHBTdHlsZVRlc3RCYXNl KToKIAogICAgIGRlZiB0ZXN0X2NoZWNrX25leHRfaW5jbHVkZV9vcmRlcl9fbGlrZWx5X3RoZW5f Y29uZmlnKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdGb3VuZCBoZWFkZXIgdGhp cyBmaWxlIGltcGxlbWVudHMgYmVmb3JlIFdlYkNvcmUgY29uZmlnLmguJywKLSAgICAgICAgICAg ICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVy KGNwcF9zdHlsZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGNwcF9zdHls ZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlLCBUcnVlKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgnRm91bmQgV2ViQ29yZSBjb25maWcuaCBhZnRlciBhIGhlYWRlciB0aGlzIGZpbGUgaW1wbGVt ZW50cy4nLAotICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuaW5jbHVkZV9zdGF0ZS5jaGVj a19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0eWxlLl9DT05GSUdfSEVBREVSLCBGYWxzZSkpCisg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5j bHVkZV9vcmRlcihjcHBfc3R5bGUuX0NPTkZJR19IRUFERVIsIEZhbHNlLCBUcnVlKSkKIAogICAg IGRlZiB0ZXN0X2NoZWNrX25leHRfaW5jbHVkZV9vcmRlcl9fb3RoZXJfdGhlbl9jb25maWcoc2Vs Zik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0ZvdW5kIG90aGVyIGhlYWRlciBiZWZvcmUg V2ViQ29yZSBjb25maWcuaC4nLAotICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuaW5jbHVk ZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1ZGVfb3JkZXIoY3BwX3N0eWxlLl9PVEhFUl9IRUFERVIs IEZhbHNlKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hl Y2tfbmV4dF9pbmNsdWRlX29yZGVyKGNwcF9zdHlsZS5fT1RIRVJfSEVBREVSLCBGYWxzZSwgVHJ1 ZSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0ZvdW5kIFdlYkNvcmUgY29uZmlnLmggYWZ0 ZXIgb3RoZXIgaGVhZGVyLicsCi0gICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5pbmNsdWRl X3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX0NPTkZJR19IRUFERVIs IEZhbHNlKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hl Y2tfbmV4dF9pbmNsdWRlX29yZGVyKGNwcF9zdHlsZS5fQ09ORklHX0hFQURFUiwgRmFsc2UsIFRy dWUpKQogCiAgICAgZGVmIHRlc3RfY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyX19jb25maWdfdGhl bl9vdGhlcl90aGVuX2xpa2VseShzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywg c2VsZi5pbmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX0NP TkZJR19IRUFERVIsIEZhbHNlKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgc2VsZi5p bmNsdWRlX3N0YXRlLmNoZWNrX25leHRfaW5jbHVkZV9vcmRlcihjcHBfc3R5bGUuX0NPTkZJR19I RUFERVIsIEZhbHNlLCBUcnVlKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnRm91bmQgb3Ro ZXIgaGVhZGVyIGJlZm9yZSBhIGhlYWRlciB0aGlzIGZpbGUgaW1wbGVtZW50cy4nLAotICAgICAg ICAgICAgICAgICAgICAgICAgIHNlbGYuaW5jbHVkZV9zdGF0ZS5jaGVja19uZXh0X2luY2x1ZGVf b3JkZXIoY3BwX3N0eWxlLl9PVEhFUl9IRUFERVIsIEZhbHNlKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGNwcF9z dHlsZS5fT1RIRVJfSEVBREVSLCBGYWxzZSwgVHJ1ZSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoJ0ZvdW5kIGhlYWRlciB0aGlzIGZpbGUgaW1wbGVtZW50cyBhZnRlciBvdGhlciBoZWFkZXIu JywKLSAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4 dF9pbmNsdWRlX29yZGVyKGNwcF9zdHlsZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLmluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRl X29yZGVyKGNwcF9zdHlsZS5fUFJJTUFSWV9IRUFERVIsIEZhbHNlLCBUcnVlKSkKIAogICAgIGRl ZiB0ZXN0X2NoZWNrX2FscGhhYmV0aWNhbF9pbmNsdWRlX29yZGVyKHNlbGYpOgogICAgICAgICBz ZWxmLmFzc2VydF9sYW5ndWFnZV9ydWxlc19jaGVjaygnZm9vLmgnLApAQCAtMjU4Niw2ICsyNTg4 LDM0IEBAIGNsYXNzIE9yZGVyT2ZJbmNsdWRlc1Rlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5jbHVkZSAiZy5oIlxuJywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyJmb28uaCIgYWxyZWFk eSBpbmNsdWRlZCBhdCBmb28uY3BwOjIgIFtidWlsZC9pbmNsdWRlXSBbNF0nKQogCisgICAgZGVm IHRlc3RfcHJpbWFyeV9oZWFkZXIoc2VsZik6CisgICAgICAgICMgRmlsZSB3aXRoIG5vbi1leGlz dGluZyBwcmltYXJ5IGhlYWRlciBzaG91bGQgbm90IHByb2R1Y2UgZXJyb3JzLgorICAgICAgICBz ZWxmLmFzc2VydF9sYW5ndWFnZV9ydWxlc19jaGVjaygnZm9vLmNwcCcsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5jbHVkZSAiY29uZmlnLmgiXG4nCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdcbicKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNpbmNsdWRlICJiYXIuaCJcbicsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcnKQorICAgICAgICAjIFByZXRlbmQg dGhhdCBoZWFkZXIgZmlsZXMgZXhpc3QuCisgICAgICAgIG9zLnBhdGguaXNmaWxlID0gbGFtYmRh IGZpbGVuYW1lOiBUcnVlCisgICAgICAgICMgTWlzc2luZyBpbmNsdWRlIGZvciBleGlzdGluZyBw cmltYXJ5IGhlYWRlciAtPiBlcnJvci4KKyAgICAgICAgc2VsZi5hc3NlcnRfbGFuZ3VhZ2VfcnVs ZXNfY2hlY2soJ2Zvby5jcHAnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnI2luY2x1ZGUgImNvbmZpZy5oIlxuJworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnXG4nCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICcjaW5jbHVkZSAiYmFyLmgiXG4nLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnRm91bmQgb3RoZXIgaGVhZGVyIGJlZm9yZSBhIGhlYWRlciB0aGlzIGZpbGUg aW1wbGVtZW50cy4gJworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn U2hvdWxkIGJlOiBjb25maWcuaCwgcHJpbWFyeSBoZWFkZXIsIGJsYW5rIGxpbmUsIGFuZCB0aGVu ICcKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2FscGhhYmV0aWNh bGx5IHNvcnRlZC4gIFtidWlsZC9pbmNsdWRlX29yZGVyXSBbNF0nKQorICAgICAgICAjIEhhdmlu ZyBpbmNsdWRlIGZvciBleGlzdGluZyBwcmltYXJ5IGhlYWRlciAtPiBubyBlcnJvci4KKyAgICAg ICAgc2VsZi5hc3NlcnRfbGFuZ3VhZ2VfcnVsZXNfY2hlY2soJ2Zvby5jcHAnLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgImNvbmZpZy5oIlxuJwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgImZvby5o IlxuJworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnXG4nCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5jbHVkZSAiYmFyLmgiXG4n LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnJykKKworICAgICAg ICBvcy5wYXRoLmlzZmlsZSA9IHNlbGYub3NfcGF0aF9pc2ZpbGVfb3JpZworCisKICAgICBkZWYg dGVzdF9jaGVja193dGZfaW5jbHVkZXMoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0X2xhbmd1 YWdlX3J1bGVzX2NoZWNrKCdmb28uY3BwJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJyNpbmNsdWRlICJjb25maWcuaCJcbicK