71690 2011-11-07 08:04:54 -0800 Add cc-bugs group to watch changes in chromium graphics 2011-11-09 17:07:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71740 0 danakj webkit-unassigned abarth backer enne eric jamesr levin levin+watchlist ojan webkit.review.bot wsiegrist oldest_to_newest 497174 0 danakj 2011-11-07 08:04:54 -0800 Add cc-bugs group to watch changes in chromium graphics 497175 1 113868 danakj 2011-11-07 08:06:06 -0800 Created attachment 113868 Patch 497177 2 webkit.review.bot 2011-11-07 08:06:58 -0800 Attachment 113868 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/common/config/watchlist:0: The email alias cc-bugs@google.com which is in the watchlist is not listed as a contributor in committers.py [watchlist/general] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 497237 3 113868 abarth 2011-11-07 09:24:14 -0800 Comment on attachment 113868 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113868&action=review > Tools/Scripts/webkitpy/common/config/watchlist:118 > + "ChromiumGraphics": [ "jamesr@chromium.org", "cc-bugs@google.com" ], Does cc-bugs have a bugs.webkit.org account? 497246 4 danakj 2011-11-07 09:37:23 -0800 Yes, made one for it. 497427 5 113868 webkit.review.bot 2011-11-07 13:30:56 -0800 Comment on attachment 113868 Patch Clearing flags on attachment: 113868 Committed r99470: <http://trac.webkit.org/changeset/99470> 497428 6 webkit.review.bot 2011-11-07 13:31:00 -0800 All reviewed patches have been landed. Closing bug. 497529 7 eric 2011-11-07 15:31:54 -0800 This broke test-webkitpy. :( 497535 8 eric 2011-11-07 15:33:32 -0800 The test seems poorly designed: FAIL: test_watch_list_load (webkitpy.common.watchlist.watchlistloader_unittest.WatchListLoaderTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Projects/WebKit/Tools/Scripts/webkitpy/common/watchlist/watchlistloader_unittest.py", line 45, in test_watch_list_load OutputCapture().assert_outputs(self, WatchListLoader(filesystem.FileSystem()).load, expected_logs="") File "/Projects/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py", line 79, in assert_outputs testcase.assertEqual(logs_string, expected_logs) AssertionError: 'The email alias cc-bugs@google.com which is in the watchlist is not listed as a contributor in committers.py\n' != '' Señor Levin? 497563 9 levin 2011-11-07 16:13:04 -0800 Rolled out here due to test breakage (which the style bot flagged): http://trac.webkit.org/changeset/99494 There are two options: 1. Add that to the contributors or 2. Add a new section to committers.py (known accounts) that I can query. The problem is that it is super bad if an email gets added to this file without having a bugzilla account and this is my best way of checking that. (fwiw, if they don't have a bugzilla account, then the bug update fails and no cc, message. etc. gets added.) #2 is a good option if you don't need autocomplete. I'm willing to advise if you need help. Thanks for understanding! 497569 10 eric 2011-11-07 16:19:33 -0800 There must be a better way to solve this. Either by some sort of cc-attempt fallback code, or some way to query bugzilla about known accounts. We have a way today with webkit-patch find-users, but it requires you to have admin privileges on bugs.webkit.org 498082 11 danakj 2011-11-08 08:16:22 -0800 I will go with #2 and add a new list to committers.py, named watcher_accounts, for bugzilla accounts that watch bugs but don't contribute. 498085 12 114077 danakj 2011-11-08 08:18:11 -0800 Created attachment 114077 add cc-bugs to a new committers.py list "watcher_accounts" 498087 13 danakj 2011-11-08 08:18:57 -0800 This will still fail style/break the test until it grabs the watcher_accounts list and deals with it accordingly. 498089 14 webkit.review.bot 2011-11-08 08:25:20 -0800 Attachment 114077 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/common/config/watchlist:0: The email alias cc-bugs@google.com which is in the watchlist is not listed as a contributor in committers.py [watchlist/general] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 498142 15 levin 2011-11-08 09:32:50 -0800 (In reply to comment #13) > This will still fail style/break the test until it grabs the watcher_accounts list and deals with it accordingly. I misspoke "Add a new section to committers.py (known accounts) that I can query." I meant "Add a new section to committers.py (known accounts) that the tool can query." but then rest shouldn't be hard. Hook up your new list so that it can be queried like contributor_by_email. Perhaps accounts_by_email? and change this line to call it: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py#L155 Then, everything will be fixed. If you need more verbose instructions, let me know and I can walk you through it. 499169 16 114319 danakj 2011-11-09 11:13:32 -0800 Created attachment 114319 create non-contributor account list and make check-webkit-style use the full account list 499173 17 danakj 2011-11-09 11:16:15 -0800 Thanks for the thoughtful instructions. I've followed through them and made the requested changes. Now you query the list of "accounts" instead of "contributors" in the style check. 499194 18 114319 eric 2011-11-09 11:34:50 -0800 Comment on attachment 114319 create non-contributor account list and make check-webkit-style use the full account list View in context: https://bugs.webkit.org/attachment.cgi?id=114319&action=review > Tools/Scripts/webkitpy/common/config/committers.py:90 > +# This is a list of email addresses who have bugzilla accounts but are not A list is not a "who", is it? > Tools/Scripts/webkitpy/common/config/committers.py:95 > + Contributor("Chromium Compositor Bugs", ["cc-bugs@google.com"], "cc-bugs"), This should be Account(...) > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:158 > - if not contributors.contributor_by_email(email): > + if not accounts.account_by_email(email): > cc_rule.remove_instruction(email) > self._log_error("The email alias %s which is in the watchlist is not listed as a contributor in committers.py" % email) > continue This code should additionally check that it's the first email, the bugzilla_email in the account. account_by_email will give you any account with that email, which might not be the bugzilla email for the account. 499200 19 levin 2011-11-09 11:36:07 -0800 (In reply to comment #18) > (From update of attachment 114319 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=114319&action=review > > > Tools/Scripts/webkitpy/common/config/committers.py:90 > > +# This is a list of email addresses who have bugzilla accounts but are not > > A list is not a "who", is it? > > > Tools/Scripts/webkitpy/common/config/committers.py:95 > > + Contributor("Chromium Compositor Bugs", ["cc-bugs@google.com"], "cc-bugs"), > > This should be Account(...) > > > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:158 > > - if not contributors.contributor_by_email(email): > > + if not accounts.account_by_email(email): > > cc_rule.remove_instruction(email) > > self._log_error("The email alias %s which is in the watchlist is not listed as a contributor in committers.py" % email) > > continue > > This code should additionally check that it's the first email, the bugzilla_email in the account. account_by_email will give you any account with that email, which might not be the bugzilla email for the account. And please add a simple test to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py? Thanks so much for doing this! 499436 20 114384 danakj 2011-11-09 16:04:46 -0800 Created attachment 114384 Patch 499438 21 danakj 2011-11-09 16:06:17 -0800 Made an additional account_by_login() that returns an Account for a login email address. Added unit tests, and addressed nits. 499499 22 114384 webkit.review.bot 2011-11-09 17:07:27 -0800 Comment on attachment 114384 Patch Clearing flags on attachment: 114384 Committed r99786: <http://trac.webkit.org/changeset/99786> 499500 23 webkit.review.bot 2011-11-09 17:07:33 -0800 All reviewed patches have been landed. Closing bug. 113868 2011-11-07 08:06:06 -0800 2011-11-08 08:18:04 -0800 Patch bug-71690-20111107110605.patch text/plain 1483 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogOTk0MjQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5NjlmYTI0ZDU2NmRhZDcwMjUwYWQ3YTQ1MTgyNjMyNWUz Y2QxY2U4Li4zZjAxNjlhZDg3MTVkOTc5MzFkZTUwY2FhZjQwYmE5OWVkYTk2ODM4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMTEtMDcgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgQWRkIGNjLWJ1Z3MgZ3JvdXAgdG8gd2F0Y2ggY2hhbmdlcyBpbiBjaHJvbWl1bSBncmFw aGljcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE2 OTAKKworICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy93YXRjaGxpc3Q6CisKIDIwMTEtMTEtMDcgIFRv ciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gRW5zdXJlIHdlIGFsd2F5cyBleHBvcnQgc3ltYm9scyBmb3IgdGhlIFF0V2ViS2l0IEFQSSB3 aGVuIGJ1aWxkaW5nIFdlYktpdApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY29uZmlnL3dhdGNobGlzdCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy93YXRjaGxpc3QKaW5kZXggM2RjYjk3YzQ5OTdkODg4YjY3NjQyMjFkNzVjNjNhOTg1Y2E1 OTU5Mi4uYWU2MDk5M2MyNGE1NmVjNmQ4NDA5NjMzYzY1Y2RiNDQzMjQ2MzM5MyAxMDA3NTUKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3dhdGNobGlzdAorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvd2F0Y2hsaXN0CkBAIC0xMTUsNyAr MTE1LDcgQEAKICAgICAgICAgIyBTcGVjaWZpY2FsbHksIGxldmluQGNocm9taXVtLm9yZyBhbmQg bGV2aW4rdGhyZWFkaW5nQGNocm9taXVtLm9yZyBhcmUKICAgICAgICAgIyB0d28gZGlmZmVyZW50 IGFjY291bnRzIGFzIGZhciBhcyBidWd6aWxsYSBpcyBjb25jZXJuZWQuCiAgICAgICAgICJDaHJv bWl1bUR1bXBSZW5kZXJUcmVlIjogWyAidGtlbnRAY2hyb21pdW0ub3JnIiwgXSwKLSAgICAgICAg IkNocm9taXVtR3JhcGhpY3MiOiBbICJqYW1lc3JAY2hyb21pdW0ub3JnIiwgXSwKKyAgICAgICAg IkNocm9taXVtR3JhcGhpY3MiOiBbICJqYW1lc3JAY2hyb21pdW0ub3JnIiwgImNjLWJ1Z3NAZ29v Z2xlLmNvbSIgXSwKICAgICAgICAgIkNocm9taXVtUHVibGljQXBpIjogWyAiZmlzaGRAY2hyb21p dW0ub3JnIiwgXSwKICAgICAgICAgIkZvcm1zIjogWyAidGtlbnRAY2hyb21pdW0ub3JnIiwgXSwK ICAgICAgICAgIkdTdHJlYW1lckdyYXBoaWNzIjogWyAicG5vcm1hbmRAaWdhbGlhLmNvbSIsIF0s Cg== 114077 2011-11-08 08:18:11 -0800 2011-11-09 11:13:25 -0800 add cc-bugs to a new committers.py list "watcher_accounts" bug-71690-20111108111809.patch text/plain 2504 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogOTk0NzAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzOTZjMjRhNDM4YjAzNzA4ODQ4ZDg1MmI0OTRjN2Y2OGI2 MjIyYmFmLi41M2Y3ODI0YTgxMmRmMmQ1NTY3ZjgwNTUyOTZmMzYyNmIxODQ2NDM5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMTEtMDggIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgQWRkIGNjLWJ1Z3MgZ3JvdXAgdG8gd2F0Y2ggY2hhbmdlcyBpbiBjaHJvbWl1bSBncmFw aGljcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE2 OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OiBDcmVhdGUgbmV3IGxp c3Qgd2F0Y2hlcl9hY2NvdW50cyBmb3IgcGFzc2l2ZSBidWcgd2F0Y2hlcnMuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3dhdGNobGlzdDogQWRkIGNjLWJ1Z3NAZ29v Z2xlLmNvbSB0byB3YXRjaCBjaHJvbWl1bSBncmFwaGljcyBkaXJlY3RvcnkuCisKIDIwMTEtMTEt MDggIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRd IFVucmV2aWV3ZWQgdHJpdmlhbCBmaXggYWZ0ZXIgYnVpbGQgc3lzdGVtIHJlZmFjdG9yaW5nLgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRl cnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5w eQppbmRleCBjNDY1MzBlMTUyZTVjZWYxOGEzZmU2ZDJkOTJhYzdiNGI1NGYyYTU4Li4zYmZiNjMy YzRlMzhjYzhhMDZmOGIwMTVlMzMxMDMwMzZmMzVlOGFjIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weQpAQCAtODAsNiArODAsMTQg QEAgY2xhc3MgUmV2aWV3ZXIoQ29tbWl0dGVyKToKICAgICAgICAgc2VsZi5jYW5fcmV2aWV3ID0g VHJ1ZQogCiAKKyMgVGhpcyBpcyBhIGxpc3Qgb2YgZW1haWwgYWRkcmVzc2VzIHdobyBoYXZlIGJ1 Z3ppbGxhIGFjY291bnRzIGFuZCB3YXRjaAorIyBidWdzIGJ1dCBhcmUgbm90IGNvbnRyaWJ1dGVy cyAoc3VjaCBhcyBtYWlsaW5nIGxpc3RzKS4KKworCit3YXRjaGVyX2FjY291bnRzID0gWworICAg IENvbnRyaWJ1dG9yKCJDaHJvbWl1bSBDb21wb3NpdG9yIEJ1Z3MiLCBbImNjLWJ1Z3NAZ29vZ2xl LmNvbSJdLCAiY2MtYnVncyIpLAorXQorCiAjIFRoaXMgaXMgYSBsaXN0IG9mIHBlb3BsZSB3aG8g YXJlIG5laXRoZXIgY29tbWl0dGVycyBub3IgcmV2aWV3ZXJzLCBidXQgZ2V0CiAjIGZyZXF1ZW50 bHkgQ0MnZWQgYnkgb3RoZXJzIG9uIEJ1Z3ppbGxhIGJ1Z3MsIHNvIHRoZWlyIG5hbWVzIHNob3Vs ZCBiZQogIyBzdXBwb3J0ZWQgYnkgYXV0b2NvbXBsZXRlLiBObyByZXZpZXcgbmVlZGVkIHRvIGFk ZCB0byB0aGUgbGlzdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NvbmZpZy93YXRjaGxpc3QgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv d2F0Y2hsaXN0CmluZGV4IDNkY2I5N2M0OTk3ZDg4OGI2NzY0MjIxZDc1YzYzYTk4NWNhNTk1OTIu LmFlNjA5OTNjMjRhNTZlYzZkODQwOTYzM2M2NWNkYjQ0MzI0NjMzOTMgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy93YXRjaGxpc3QKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3dhdGNobGlzdApAQCAtMTE1LDcgKzExNSw3 IEBACiAgICAgICAgICMgU3BlY2lmaWNhbGx5LCBsZXZpbkBjaHJvbWl1bS5vcmcgYW5kIGxldmlu K3RocmVhZGluZ0BjaHJvbWl1bS5vcmcgYXJlCiAgICAgICAgICMgdHdvIGRpZmZlcmVudCBhY2Nv dW50cyBhcyBmYXIgYXMgYnVnemlsbGEgaXMgY29uY2VybmVkLgogICAgICAgICAiQ2hyb21pdW1E dW1wUmVuZGVyVHJlZSI6IFsgInRrZW50QGNocm9taXVtLm9yZyIsIF0sCi0gICAgICAgICJDaHJv bWl1bUdyYXBoaWNzIjogWyAiamFtZXNyQGNocm9taXVtLm9yZyIsIF0sCisgICAgICAgICJDaHJv bWl1bUdyYXBoaWNzIjogWyAiamFtZXNyQGNocm9taXVtLm9yZyIsICJjYy1idWdzQGdvb2dsZS5j b20iIF0sCiAgICAgICAgICJDaHJvbWl1bVB1YmxpY0FwaSI6IFsgImZpc2hkQGNocm9taXVtLm9y ZyIsIF0sCiAgICAgICAgICJGb3JtcyI6IFsgInRrZW50QGNocm9taXVtLm9yZyIsIF0sCiAgICAg ICAgICJHU3RyZWFtZXJHcmFwaGljcyI6IFsgInBub3JtYW5kQGlnYWxpYS5jb20iLCBdLAo= 114319 2011-11-09 11:13:32 -0800 2011-11-09 16:04:39 -0800 create non-contributor account list and make check-webkit-style use the full account list bug-71690-20111109141331.patch text/plain 7518 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogOTk0NzAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzOTZjMjRhNDM4YjAzNzA4ODQ4ZDg1MmI0OTRjN2Y2OGI2 MjIyYmFmLi42YWE3NmQ3ODJmOGI4ZTI1OGVjY2RlMjdiMmQyM2UxYThjNzhhOWIwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMTEtMDggIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgQWRkIGNjLWJ1Z3MgZ3JvdXAgdG8gd2F0Y2ggY2hhbmdlcyBpbiBjaHJvbWl1bSBncmFw aGljcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE2 OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OiBDcmVhdGUgbmV3IGxp c3Qgb2Ygbm9uLWNvbnRyaWJ1dG9yIGFjY291bnRzIGZvciBwYXNzaXZlIGJ1ZyB3YXRjaGVycy4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvd2F0Y2hsaXN0OiBBZGQg Y2MtYnVnc0Bnb29nbGUuY29tIHRvIHdhdGNoIGNocm9taXVtIGdyYXBoaWNzIGRpcmVjdG9yeS4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFy c2VyLnB5OiBVc2UgdGhlIGZ1bGwgYWNjb3VudCBsaXN0IChub3QgY29udHJpYnV0b3Igc3Vic2V0 KS4KKwogMjAxMS0xMS0wOCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgog CiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCB0cml2aWFsIGZpeCBhZnRlciBidWlsZCBzeXN0ZW0g cmVmYWN0b3JpbmcuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j b25maWcvY29tbWl0dGVycy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZp Zy9jb21taXR0ZXJzLnB5CmluZGV4IGM0NjUzMGUxNTJlNWNlZjE4YTNmZTZkMmQ5MmFjN2I0YjU0 ZjJhNTguLjc3ZDEzMjlmNGU1ODJkYjQ3NGRlY2RlZmQ0NDBjZWJmOTY3ZjFhOTkgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5CkBA IC0yOSw3ICsyOSw4IEBACiAjCiAjIFdlYktpdCdzIFB5dGhvbiBtb2R1bGUgZm9yIGNvbW1pdHRl ciBhbmQgcmV2aWV3ZXIgdmFsaWRhdGlvbi4KIAotY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToK KworY2xhc3MgQWNjb3VudChvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBl bWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZV9vcl9uaWNrbmFtZXM9Tm9uZSk6CiAgICAgICAg IGFzc2VydChuYW1lKQogICAgICAgICBhc3NlcnQoZW1haWxfb3JfZW1haWxzKQpAQCAtNjgsNiAr NjksMTIgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICAgICAgcmV0dXJuIEZhbHNl CiAKIAorY2xhc3MgQ29udHJpYnV0b3IoQWNjb3VudCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYs IG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5vbmUpOgorICAgICAgICBBY2Nv dW50Ll9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lKQor ICAgICAgICBzZWxmLmlzX2NvbnRyaWJ1dG9yID0gVHJ1ZQorCisKIGNsYXNzIENvbW1pdHRlcihD b250cmlidXRvcik6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWls cywgaXJjX25pY2tuYW1lPU5vbmUpOgogICAgICAgICBDb250cmlidXRvci5fX2luaXRfXyhzZWxm LCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSkKQEAgLTgwLDYgKzg3LDE0IEBA IGNsYXNzIFJldmlld2VyKENvbW1pdHRlcik6CiAgICAgICAgIHNlbGYuY2FuX3JldmlldyA9IFRy dWUKIAogCisjIFRoaXMgaXMgYSBsaXN0IG9mIGVtYWlsIGFkZHJlc3NlcyB3aG8gaGF2ZSBidWd6 aWxsYSBhY2NvdW50cyBidXQgYXJlIG5vdAorIyBjb250cmlidXRlcnMgKHN1Y2ggYXMgbWFpbGlu ZyBsaXN0cykuCisKKword2F0Y2hlcnNfd2hvX2FyZV9ub3RfY29udHJpYnV0b3JzID0gWworICAg IENvbnRyaWJ1dG9yKCJDaHJvbWl1bSBDb21wb3NpdG9yIEJ1Z3MiLCBbImNjLWJ1Z3NAZ29vZ2xl LmNvbSJdLCAiY2MtYnVncyIpLAorXQorCiAjIFRoaXMgaXMgYSBsaXN0IG9mIHBlb3BsZSB3aG8g YXJlIG5laXRoZXIgY29tbWl0dGVycyBub3IgcmV2aWV3ZXJzLCBidXQgZ2V0CiAjIGZyZXF1ZW50 bHkgQ0MnZWQgYnkgb3RoZXJzIG9uIEJ1Z3ppbGxhIGJ1Z3MsIHNvIHRoZWlyIG5hbWVzIHNob3Vs ZCBiZQogIyBzdXBwb3J0ZWQgYnkgYXV0b2NvbXBsZXRlLiBObyByZXZpZXcgbmVlZGVkIHRvIGFk ZCB0byB0aGUgbGlzdC4KQEAgLTQzNywxMSArNDUyLDE2IEBAIGNsYXNzIENvbW1pdHRlckxpc3Qo b2JqZWN0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwKICAgICAgICAgICAgICAgICAgY29tbWl0 dGVycz1jb21taXR0ZXJzX3VuYWJsZV90b19yZXZpZXcsCiAgICAgICAgICAgICAgICAgIHJldmll d2Vycz1yZXZpZXdlcnNfbGlzdCwKLSAgICAgICAgICAgICAgICAgY29udHJpYnV0b3JzPWNvbnRy aWJ1dG9yc193aG9fYXJlX25vdF9jb21taXR0ZXJzKToKKyAgICAgICAgICAgICAgICAgY29udHJp YnV0b3JzPWNvbnRyaWJ1dG9yc193aG9fYXJlX25vdF9jb21taXR0ZXJzLAorICAgICAgICAgICAg ICAgICB3YXRjaGVycz13YXRjaGVyc193aG9fYXJlX25vdF9jb250cmlidXRvcnMpOgorICAgICAg ICBzZWxmLl9hY2NvdW50cyA9IHdhdGNoZXJzICsgY29udHJpYnV0b3JzICsgY29tbWl0dGVycyAr IHJldmlld2VycwogICAgICAgICBzZWxmLl9jb250cmlidXRvcnMgPSBjb250cmlidXRvcnMgKyBj b21taXR0ZXJzICsgcmV2aWV3ZXJzCiAgICAgICAgIHNlbGYuX2NvbW1pdHRlcnMgPSBjb21taXR0 ZXJzICsgcmV2aWV3ZXJzCiAgICAgICAgIHNlbGYuX3Jldmlld2VycyA9IHJldmlld2VycwotICAg ICAgICBzZWxmLl9jb250cmlidXRvcnNfYnlfZW1haWwgPSB7fQorICAgICAgICBzZWxmLl9hY2Nv dW50c19ieV9lbWFpbCA9IHt9CisKKyAgICBkZWYgYWNjb3VudHMoc2VsZik6CisgICAgICAgIHJl dHVybiBzZWxmLl9hY2NvdW50cwogCiAgICAgZGVmIGNvbnRyaWJ1dG9ycyhzZWxmKToKICAgICAg ICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9ycwpAQCAtNDUyLDEzICs0NzIsMTggQEAgY2xhc3Mg Q29tbWl0dGVyTGlzdChvYmplY3QpOgogICAgIGRlZiByZXZpZXdlcnMoc2VsZik6CiAgICAgICAg IHJldHVybiBzZWxmLl9yZXZpZXdlcnMKIAotICAgIGRlZiBfZW1haWxfdG9fY29udHJpYnV0b3Jf bWFwKHNlbGYpOgotICAgICAgICBpZiBub3QgbGVuKHNlbGYuX2NvbnRyaWJ1dG9yc19ieV9lbWFp bCk6Ci0gICAgICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4gc2VsZi5fY29udHJpYnV0b3JzOgot ICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjb250cmlidXRvci5lbWFpbHM6Ci0gICAgICAg ICAgICAgICAgICAgIGFzc2VydChlbWFpbCBub3QgaW4gc2VsZi5fY29udHJpYnV0b3JzX2J5X2Vt YWlsKSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBkdXBsaWNhdGUgZW1haWxzLgotICAgICAgICAg ICAgICAgICAgICBzZWxmLl9jb250cmlidXRvcnNfYnlfZW1haWxbZW1haWxdID0gY29udHJpYnV0 b3IKLSAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9yc19ieV9lbWFpbAorICAgIGRlZiBf ZW1haWxfdG9fYWNjb3VudF9tYXAoc2VsZik6CisgICAgICAgIGlmIG5vdCBsZW4oc2VsZi5fYWNj b3VudHNfYnlfZW1haWwpOgorICAgICAgICAgICAgZm9yIGFjY291bnQgaW4gc2VsZi5fYWNjb3Vu dHM6CisgICAgICAgICAgICAgICAgZm9yIGVtYWlsIGluIGFjY291bnQuZW1haWxzOgorICAgICAg ICAgICAgICAgICAgICBhc3NlcnQoZW1haWwgbm90IGluIHNlbGYuX2FjY291bnRzX2J5X2VtYWls KSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBkdXBsaWNhdGUgZW1haWxzLgorICAgICAgICAgICAg ICAgICAgICBzZWxmLl9hY2NvdW50c19ieV9lbWFpbFtlbWFpbF0gPSBhY2NvdW50CisgICAgICAg IHJldHVybiBzZWxmLl9hY2NvdW50c19ieV9lbWFpbAorCisgICAgZGVmIF9jb250cmlidXRvcl9v bmx5KHNlbGYsIHJlY29yZCk6CisgICAgICAgIGlmIHJlY29yZCBhbmQgbm90IHJlY29yZC5pc19j b250cmlidXRvcjoKKyAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIHJldHVybiByZWNv cmQKIAogICAgIGRlZiBfY29tbWl0dGVyX29ubHkoc2VsZiwgcmVjb3JkKToKICAgICAgICAgaWYg cmVjb3JkIGFuZCBub3QgcmVjb3JkLmNhbl9jb21taXQ6CkBAIC00ODksMTEgKzUxNCwxNCBAQCBj bGFzcyBDb21taXR0ZXJMaXN0KG9iamVjdCk6CiAgICAgZGVmIGNvbnRyaWJ1dG9yc19ieV9zZWFy Y2hfc3RyaW5nKHNlbGYsIHN0cmluZyk6CiAgICAgICAgIHJldHVybiBmaWx0ZXIobGFtYmRhIGNv bnRyaWJ1dG9yOiBjb250cmlidXRvci5jb250YWluc19zdHJpbmcoc3RyaW5nKSwgc2VsZi5jb250 cmlidXRvcnMoKSkKIAorICAgIGRlZiBhY2NvdW50X2J5X2VtYWlsKHNlbGYsIGVtYWlsKToKKyAg ICAgICAgcmV0dXJuIHNlbGYuX2VtYWlsX3RvX2FjY291bnRfbWFwKCkuZ2V0KGVtYWlsLmxvd2Vy KCkpCisKICAgICBkZWYgY29udHJpYnV0b3JfYnlfZW1haWwoc2VsZiwgZW1haWwpOgotICAgICAg ICByZXR1cm4gc2VsZi5fZW1haWxfdG9fY29udHJpYnV0b3JfbWFwKCkuZ2V0KGVtYWlsLmxvd2Vy KCkpCisgICAgICAgIHJldHVybiBzZWxmLl9jb250cmlidXRlcl9vbmx5KHNlbGYuYWNjb3VudF9i eV9lbWFpbChlbWFpbCkpCiAKICAgICBkZWYgY29tbWl0dGVyX2J5X2VtYWlsKHNlbGYsIGVtYWls KToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdHRlcl9vbmx5KHNlbGYuY29udHJpYnV0b3Jf YnlfZW1haWwoZW1haWwpKQorICAgICAgICByZXR1cm4gc2VsZi5fY29tbWl0dGVyX29ubHkoc2Vs Zi5hY2NvdW50X2J5X2VtYWlsKGVtYWlsKSkKIAogICAgIGRlZiByZXZpZXdlcl9ieV9lbWFpbChz ZWxmLCBlbWFpbCk6Ci0gICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlcl9vbmx5KHNlbGYuY29u dHJpYnV0b3JfYnlfZW1haWwoZW1haWwpKQorICAgICAgICByZXR1cm4gc2VsZi5fcmV2aWV3ZXJf b25seShzZWxmLmFjY291bnRfYnlfZW1haWwoZW1haWwpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3dhdGNobGlzdCBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NvbmZpZy93YXRjaGxpc3QKaW5kZXggM2RjYjk3YzQ5OTdkODg4YjY3NjQy MjFkNzVjNjNhOTg1Y2E1OTU5Mi4uYWU2MDk5M2MyNGE1NmVjNmQ4NDA5NjMzYzY1Y2RiNDQzMjQ2 MzM5MyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3dh dGNobGlzdAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvd2F0Y2hs aXN0CkBAIC0xMTUsNyArMTE1LDcgQEAKICAgICAgICAgIyBTcGVjaWZpY2FsbHksIGxldmluQGNo cm9taXVtLm9yZyBhbmQgbGV2aW4rdGhyZWFkaW5nQGNocm9taXVtLm9yZyBhcmUKICAgICAgICAg IyB0d28gZGlmZmVyZW50IGFjY291bnRzIGFzIGZhciBhcyBidWd6aWxsYSBpcyBjb25jZXJuZWQu CiAgICAgICAgICJDaHJvbWl1bUR1bXBSZW5kZXJUcmVlIjogWyAidGtlbnRAY2hyb21pdW0ub3Jn IiwgXSwKLSAgICAgICAgIkNocm9taXVtR3JhcGhpY3MiOiBbICJqYW1lc3JAY2hyb21pdW0ub3Jn IiwgXSwKKyAgICAgICAgIkNocm9taXVtR3JhcGhpY3MiOiBbICJqYW1lc3JAY2hyb21pdW0ub3Jn IiwgImNjLWJ1Z3NAZ29vZ2xlLmNvbSIgXSwKICAgICAgICAgIkNocm9taXVtUHVibGljQXBpIjog WyAiZmlzaGRAY2hyb21pdW0ub3JnIiwgXSwKICAgICAgICAgIkZvcm1zIjogWyAidGtlbnRAY2hy b21pdW0ub3JnIiwgXSwKICAgICAgICAgIkdTdHJlYW1lckdyYXBoaWNzIjogWyAicG5vcm1hbmRA aWdhbGlhLmNvbSIsIF0sCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weQppbmRleCA1ZTRhZmI2OTcxNTQyMDIz NmQyNTk4YWQ0NDA1MjEwMzBiZjMxZWU5Li5iYzAwYzU0MWUzOGRjM2YzOTllMWJiNDQ1MGRlNjI4 MjNlNGVkNzZiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRj aGxpc3Qvd2F0Y2hsaXN0cGFyc2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXIucHkKQEAgLTE0NiwxMyArMTQ2LDEzIEBAIGNs YXNzIFdhdGNoTGlzdFBhcnNlcihvYmplY3QpOgogICAgICAgICBzZWxmLl92YWxpZGF0ZV9kZWZp bml0aW9ucyhjY19kZWZpbml0aW9uc19zZXQsIHNlbGYuX0NDX1JVTEVTLCB3YXRjaF9saXN0KQog ICAgICAgICBzZWxmLl92YWxpZGF0ZV9kZWZpbml0aW9ucyhtZXNzYWdlc19kZWZpbml0aW9uc19z ZXQsIHNlbGYuX01FU1NBR0VfUlVMRVMsIHdhdGNoX2xpc3QpCiAKLSAgICAgICAgY29udHJpYnV0 b3JzID0gQ29tbWl0dGVyTGlzdCgpCisgICAgICAgIGFjY291bnRzID0gQ29tbWl0dGVyTGlzdCgp CiAgICAgICAgIGZvciBjY19ydWxlIGluIHdhdGNoX2xpc3QuY2NfcnVsZXM6CiAgICAgICAgICAg ICAjIENvcHkgdGhlIGluc3RydWN0aW9ucyBzaW5jZSB3ZSdsbCBiZSByZW1vdmUgaXRlbXMgZnJv bSB0aGUgb3JpZ2luYWwgbGlzdCBhbmQKICAgICAgICAgICAgICMgbW9kaWZ5aW5nIGEgbGlzdCB3 aGlsZSBpdGVyYXRpbmcgdGhyb3VnaCBpdCBsZWFkcyB0byB1bmRlZmluZWQgYmVoYXZpb3IuCiAg ICAgICAgICAgICBpbnRydWN0aW9uc19jb3B5ID0gY2NfcnVsZS5pbnN0cnVjdGlvbnMoKVs6XQog ICAgICAgICAgICAgZm9yIGVtYWlsIGluIGludHJ1Y3Rpb25zX2NvcHk6Ci0gICAgICAgICAgICAg ICAgaWYgbm90IGNvbnRyaWJ1dG9ycy5jb250cmlidXRvcl9ieV9lbWFpbChlbWFpbCk6CisgICAg ICAgICAgICAgICAgaWYgbm90IGFjY291bnRzLmFjY291bnRfYnlfZW1haWwoZW1haWwpOgogICAg ICAgICAgICAgICAgICAgICBjY19ydWxlLnJlbW92ZV9pbnN0cnVjdGlvbihlbWFpbCkKICAgICAg ICAgICAgICAgICAgICAgc2VsZi5fbG9nX2Vycm9yKCJUaGUgZW1haWwgYWxpYXMgJXMgd2hpY2gg aXMgaW4gdGhlIHdhdGNobGlzdCBpcyBub3QgbGlzdGVkIGFzIGEgY29udHJpYnV0b3IgaW4gY29t bWl0dGVycy5weSIgJSBlbWFpbCkKICAgICAgICAgICAgICAgICAgICAgY29udGludWUK 114384 2011-11-09 16:04:46 -0800 2011-11-09 17:07:27 -0800 Patch bug-71690-20111109190445.patch text/plain 11971 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogOTk0NzAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzOTZjMjRhNDM4YjAzNzA4ODQ4ZDg1MmI0OTRjN2Y2OGI2 MjIyYmFmLi5kZWM4NWIxMTQ0Mjc3Yzk3NWI1ZmY1ZDA3YmI5ODIyNjA2MmJkYTcyIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMTEtMDkgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgQWRkIGNjLWJ1Z3MgZ3JvdXAgdG8gd2F0Y2ggY2hhbmdlcyBpbiBjaHJvbWl1bSBncmFw aGljcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE2 OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OiBNYWtlIG5ldyBBY2Nv dW50IHN1cGVyY2xhc3MgZm9yIG5vbi1jb250cmlidXRvciB3YXRjaCBhY2NvdW50cworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5 OiBUZXN0IHRoZSBBY2NvdW50IHN1cGVyY2xhc3MKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jb25maWcvd2F0Y2hsaXN0OiBBZGQgY2MtYnVnc0Bnb29nbGUuY29tIHRvIHdhdGNo IGxpc3QKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hs aXN0cGFyc2VyLnB5OiBDaGVjayBmb3IgQWNjb3VudHMgYWxzbywgYnV0IHJlcXVpcmUgaXQgdG8g YmUgdGhlIGJ1Z3ppbGxhIGVtYWlsIGZvciBhbnkgQWNjb3VudC9Db250cmlidXRvci9ldGMuCisK IDIwMTEtMTEtMDggIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAg ICAgICBbUXRdIFVucmV2aWV3ZWQgdHJpdmlhbCBmaXggYWZ0ZXIgYnVpbGQgc3lzdGVtIHJlZmFj dG9yaW5nLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmln L2NvbW1pdHRlcnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29t bWl0dGVycy5weQppbmRleCBjNDY1MzBlMTUyZTVjZWYxOGEzZmU2ZDJkOTJhYzdiNGI1NGYyYTU4 Li45NTY4ZjJiNGE2NWI0MTJlMWE0YThmMjYzMjkzY2E0MTVkMWI0NDZlIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weQpAQCAtMjks NyArMjksOCBAQAogIwogIyBXZWJLaXQncyBQeXRob24gbW9kdWxlIGZvciBjb21taXR0ZXIgYW5k IHJldmlld2VyIHZhbGlkYXRpb24uCiAKLWNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CisKK2Ns YXNzIEFjY291bnQob2JqZWN0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxf b3JfZW1haWxzLCBpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzPU5vbmUpOgogICAgICAgICBhc3Nl cnQobmFtZSkKICAgICAgICAgYXNzZXJ0KGVtYWlsX29yX2VtYWlscykKQEAgLTY4LDYgKzY5LDEy IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBGYWxzZQogCiAK K2NsYXNzIENvbnRyaWJ1dG9yKEFjY291bnQpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1l LCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZT1Ob25lKToKKyAgICAgICAgQWNjb3VudC5f X2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSkKKyAgICAg ICAgc2VsZi5pc19jb250cmlidXRvciA9IFRydWUKKworCiBjbGFzcyBDb21taXR0ZXIoQ29udHJp YnV0b3IpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGly Y19uaWNrbmFtZT1Ob25lKToKICAgICAgICAgQ29udHJpYnV0b3IuX19pbml0X18oc2VsZiwgbmFt ZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWUpCkBAIC04MCw2ICs4NywxNyBAQCBjbGFz cyBSZXZpZXdlcihDb21taXR0ZXIpOgogICAgICAgICBzZWxmLmNhbl9yZXZpZXcgPSBUcnVlCiAK IAorIyBUaGlzIGlzIGEgbGlzdCBvZiBlbWFpbCBhZGRyZXNzZXMgdGhhdCBoYXZlIGJ1Z3ppbGxh IGFjY291bnRzIGJ1dCBhcmUgbm90CisjIHVzZWQgZm9yIGNvbnRyaWJ1dGluZyAoc3VjaCBhcyBt YWlsaW5nIGxpc3RzKS4KKworCit3YXRjaGVyc193aG9fYXJlX25vdF9jb250cmlidXRvcnMgPSBb CisgICAgQWNjb3VudCgiQ2hyb21pdW0gQ29tcG9zaXRvciBCdWdzIiwgWyJjYy1idWdzQGdvb2ds ZS5jb20iXSwgIiIpLAorICAgIEFjY291bnQoIkRhdmlkIExldmluIiwgWyJsZXZpbit0aHJlYWRp bmdAY2hyb21pdW0ub3JnIl0sICIiKSwKKyAgICBBY2NvdW50KCJEYXZpZCBMZXZpbiIsIFsibGV2 aW4rd2F0Y2hsaXN0QGNocm9taXVtLm9yZyJdLCAiIiksCitdCisKKwogIyBUaGlzIGlzIGEgbGlz dCBvZiBwZW9wbGUgd2hvIGFyZSBuZWl0aGVyIGNvbW1pdHRlcnMgbm9yIHJldmlld2VycywgYnV0 IGdldAogIyBmcmVxdWVudGx5IENDJ2VkIGJ5IG90aGVycyBvbiBCdWd6aWxsYSBidWdzLCBzbyB0 aGVpciBuYW1lcyBzaG91bGQgYmUKICMgc3VwcG9ydGVkIGJ5IGF1dG9jb21wbGV0ZS4gTm8gcmV2 aWV3IG5lZWRlZCB0byBhZGQgdG8gdGhlIGxpc3QuCkBAIC0zNjAsNyArMzc4LDcgQEAgcmV2aWV3 ZXJzX2xpc3QgPSBbCiAgICAgUmV2aWV3ZXIoIkRhdmlkIEhhcnJpc29uIiwgImhhcnJpc29uQGFw cGxlLmNvbSIsICJoYXJyaXNvbiIpLAogICAgIFJldmlld2VyKCJEYXZpZCBIeWF0dCIsICJoeWF0 dEBhcHBsZS5jb20iLCBbImRoeWF0dCIsICJoeWF0dCJdKSwKICAgICBSZXZpZXdlcigiRGF2aWQg S2lsemVyIiwgWyJkZGtpbHplckB3ZWJraXQub3JnIiwgImRka2lsemVyQGFwcGxlLmNvbSJdLCAi ZGRraWx6ZXIiKSwKLSAgICBSZXZpZXdlcigiRGF2aWQgTGV2aW4iLCBbImxldmluQGNocm9taXVt Lm9yZyIsICJsZXZpbit0aHJlYWRpbmdAY2hyb21pdW0ub3JnIiwgImxldmluK3dhdGNobGlzdEBj aHJvbWl1bS5vcmciXSwgImRhdmVfbGV2aW4iKSwKKyAgICBSZXZpZXdlcigiRGF2aWQgTGV2aW4i LCAibGV2aW5AY2hyb21pdW0ub3JnIiwgImRhdmVfbGV2aW4iKSwKICAgICBSZXZpZXdlcigiRGVh biBKYWNrc29uIiwgImRpbm9AYXBwbGUuY29tIiwgImRpbm8iKSwKICAgICBSZXZpZXdlcigiRGlt aXRyaSBHbGF6a292IiwgImRnbGF6a292QGNocm9taXVtLm9yZyIsICJkZ2xhemtvdiIpLAogICAg IFJldmlld2VyKCJEaXJrIFByYW5rZSIsICJkcHJhbmtlQGNocm9taXVtLm9yZyIsICJkcHJhbmtl IiksCkBAIC00MzcsMTEgKzQ1NSwxNyBAQCBjbGFzcyBDb21taXR0ZXJMaXN0KG9iamVjdCk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsCiAgICAgICAgICAgICAgICAgIGNvbW1pdHRlcnM9Y29tbWl0 dGVyc191bmFibGVfdG9fcmV2aWV3LAogICAgICAgICAgICAgICAgICByZXZpZXdlcnM9cmV2aWV3 ZXJzX2xpc3QsCi0gICAgICAgICAgICAgICAgIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnNfd2hv X2FyZV9ub3RfY29tbWl0dGVycyk6CisgICAgICAgICAgICAgICAgIGNvbnRyaWJ1dG9ycz1jb250 cmlidXRvcnNfd2hvX2FyZV9ub3RfY29tbWl0dGVycywKKyAgICAgICAgICAgICAgICAgd2F0Y2hl cnM9d2F0Y2hlcnNfd2hvX2FyZV9ub3RfY29udHJpYnV0b3JzKToKKyAgICAgICAgc2VsZi5fYWNj b3VudHMgPSB3YXRjaGVycyArIGNvbnRyaWJ1dG9ycyArIGNvbW1pdHRlcnMgKyByZXZpZXdlcnMK ICAgICAgICAgc2VsZi5fY29udHJpYnV0b3JzID0gY29udHJpYnV0b3JzICsgY29tbWl0dGVycyAr IHJldmlld2VycwogICAgICAgICBzZWxmLl9jb21taXR0ZXJzID0gY29tbWl0dGVycyArIHJldmll d2VycwogICAgICAgICBzZWxmLl9yZXZpZXdlcnMgPSByZXZpZXdlcnMKLSAgICAgICAgc2VsZi5f Y29udHJpYnV0b3JzX2J5X2VtYWlsID0ge30KKyAgICAgICAgc2VsZi5fYWNjb3VudHNfYnlfZW1h aWwgPSB7fQorICAgICAgICBzZWxmLl9hY2NvdW50c19ieV9sb2dpbiA9IHt9CisKKyAgICBkZWYg YWNjb3VudHMoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9hY2NvdW50cwogCiAgICAgZGVm IGNvbnRyaWJ1dG9ycyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9ycwpA QCAtNDUyLDEzICs0NzYsMjcgQEAgY2xhc3MgQ29tbWl0dGVyTGlzdChvYmplY3QpOgogICAgIGRl ZiByZXZpZXdlcnMoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlcnMKIAotICAg IGRlZiBfZW1haWxfdG9fY29udHJpYnV0b3JfbWFwKHNlbGYpOgotICAgICAgICBpZiBub3QgbGVu KHNlbGYuX2NvbnRyaWJ1dG9yc19ieV9lbWFpbCk6Ci0gICAgICAgICAgICBmb3IgY29udHJpYnV0 b3IgaW4gc2VsZi5fY29udHJpYnV0b3JzOgotICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBj b250cmlidXRvci5lbWFpbHM6Ci0gICAgICAgICAgICAgICAgICAgIGFzc2VydChlbWFpbCBub3Qg aW4gc2VsZi5fY29udHJpYnV0b3JzX2J5X2VtYWlsKSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBk dXBsaWNhdGUgZW1haWxzLgotICAgICAgICAgICAgICAgICAgICBzZWxmLl9jb250cmlidXRvcnNf YnlfZW1haWxbZW1haWxdID0gY29udHJpYnV0b3IKLSAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRy aWJ1dG9yc19ieV9lbWFpbAorICAgIGRlZiBfZW1haWxfdG9fYWNjb3VudF9tYXAoc2VsZik6Cisg ICAgICAgIGlmIG5vdCBsZW4oc2VsZi5fYWNjb3VudHNfYnlfZW1haWwpOgorICAgICAgICAgICAg Zm9yIGFjY291bnQgaW4gc2VsZi5fYWNjb3VudHM6CisgICAgICAgICAgICAgICAgZm9yIGVtYWls IGluIGFjY291bnQuZW1haWxzOgorICAgICAgICAgICAgICAgICAgICBhc3NlcnQoZW1haWwgbm90 IGluIHNlbGYuX2FjY291bnRzX2J5X2VtYWlsKSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBkdXBs aWNhdGUgZW1haWxzLgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9hY2NvdW50c19ieV9lbWFp bFtlbWFpbF0gPSBhY2NvdW50CisgICAgICAgIHJldHVybiBzZWxmLl9hY2NvdW50c19ieV9lbWFp bAorCisgICAgZGVmIF9sb2dpbl90b19hY2NvdW50X21hcChzZWxmKToKKyAgICAgICAgaWYgbm90 IGxlbihzZWxmLl9hY2NvdW50c19ieV9sb2dpbik6CisgICAgICAgICAgICBmb3IgYWNjb3VudCBp biBzZWxmLl9hY2NvdW50czoKKyAgICAgICAgICAgICAgICBpZiBhY2NvdW50LmVtYWlsczoKKyAg ICAgICAgICAgICAgICAgICAgbG9naW4gPSBhY2NvdW50LmJ1Z3ppbGxhX2VtYWlsKCkKKyAgICAg ICAgICAgICAgICAgICAgYXNzZXJ0KGxvZ2luIG5vdCBpbiBzZWxmLl9hY2NvdW50c19ieV9sb2dp bikgICMgV2Ugc2hvdWxkIG5ldmVyIGhhdmUgZHVwbGljYXRlIGVtYWlscy4KKyAgICAgICAgICAg ICAgICAgICAgc2VsZi5fYWNjb3VudHNfYnlfbG9naW5bbG9naW5dID0gYWNjb3VudAorICAgICAg ICByZXR1cm4gc2VsZi5fYWNjb3VudHNfYnlfbG9naW4KKworICAgIGRlZiBfY29udHJpYnV0b3Jf b25seShzZWxmLCByZWNvcmQpOgorICAgICAgICBpZiByZWNvcmQgYW5kIG5vdCByZWNvcmQuaXNf Y29udHJpYnV0b3I6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICByZXR1cm4gcmVj b3JkCiAKICAgICBkZWYgX2NvbW1pdHRlcl9vbmx5KHNlbGYsIHJlY29yZCk6CiAgICAgICAgIGlm IHJlY29yZCBhbmQgbm90IHJlY29yZC5jYW5fY29tbWl0OgpAQCAtNDg5LDExICs1MjcsMTcgQEAg Y2xhc3MgQ29tbWl0dGVyTGlzdChvYmplY3QpOgogICAgIGRlZiBjb250cmlidXRvcnNfYnlfc2Vh cmNoX3N0cmluZyhzZWxmLCBzdHJpbmcpOgogICAgICAgICByZXR1cm4gZmlsdGVyKGxhbWJkYSBj b250cmlidXRvcjogY29udHJpYnV0b3IuY29udGFpbnNfc3RyaW5nKHN0cmluZyksIHNlbGYuY29u dHJpYnV0b3JzKCkpCiAKKyAgICBkZWYgYWNjb3VudF9ieV9sb2dpbihzZWxmLCBsb2dpbik6Cisg ICAgICAgIHJldHVybiBzZWxmLl9sb2dpbl90b19hY2NvdW50X21hcCgpLmdldChsb2dpbi5sb3dl cigpKQorCisgICAgZGVmIGFjY291bnRfYnlfZW1haWwoc2VsZiwgZW1haWwpOgorICAgICAgICBy ZXR1cm4gc2VsZi5fZW1haWxfdG9fYWNjb3VudF9tYXAoKS5nZXQoZW1haWwubG93ZXIoKSkKKwog ICAgIGRlZiBjb250cmlidXRvcl9ieV9lbWFpbChzZWxmLCBlbWFpbCk6Ci0gICAgICAgIHJldHVy biBzZWxmLl9lbWFpbF90b19jb250cmlidXRvcl9tYXAoKS5nZXQoZW1haWwubG93ZXIoKSkKKyAg ICAgICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9yX29ubHkoc2VsZi5hY2NvdW50X2J5X2VtYWls KGVtYWlsKSkKIAogICAgIGRlZiBjb21taXR0ZXJfYnlfZW1haWwoc2VsZiwgZW1haWwpOgotICAg ICAgICByZXR1cm4gc2VsZi5fY29tbWl0dGVyX29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9lbWFp bChlbWFpbCkpCisgICAgICAgIHJldHVybiBzZWxmLl9jb21taXR0ZXJfb25seShzZWxmLmFjY291 bnRfYnlfZW1haWwoZW1haWwpKQogCiAgICAgZGVmIHJldmlld2VyX2J5X2VtYWlsKHNlbGYsIGVt YWlsKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VyX29ubHkoc2VsZi5jb250cmlidXRv cl9ieV9lbWFpbChlbWFpbCkpCisgICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlcl9vbmx5KHNl bGYuYWNjb3VudF9ieV9lbWFpbChlbWFpbCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVyc191bml0dGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CmluZGV4IDhh ZDI3ZWFkMmI3Y2MwMWIzY2MxZTBkZWE4ZGY0YmY4YWI1MWY0YzcuLjZhOGIxMGMzYTcwZTgyZDFk YzkyMDJhMzU3YmJjZTIxN2NmMDFlOTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CkBAIC0yNywx NyArMjcsMTkgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogaW1wb3J0IHVuaXR0ZXN0Ci1mcm9tIHdlYmtp dHB5LmNvbW1vbi5jb25maWcuY29tbWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdCwgQ29udHJp YnV0b3IsIENvbW1pdHRlciwgUmV2aWV3ZXIKK2Zyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5j b21taXR0ZXJzIGltcG9ydCBBY2NvdW50LCBDb21taXR0ZXJMaXN0LCBDb250cmlidXRvciwgQ29t bWl0dGVyLCBSZXZpZXdlcgogCiBjbGFzcyBDb21taXR0ZXJzVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgZGVmIHRlc3RfY29tbWl0dGVyX2xvb2t1cChzZWxmKToKKyAgICAgICAgYWNjb3Vu dCA9IEFjY291bnQoJ1Rlc3QgWmVybycsIFsnemVyb0B0ZXN0LmNvbScsICd6ZXJvQGdtYWlsLmNv bSddLCAnemVybycpCiAgICAgICAgIGNvbW1pdHRlciA9IENvbW1pdHRlcignVGVzdCBPbmUnLCAn b25lQHRlc3QuY29tJywgJ29uZScpCiAgICAgICAgIHJldmlld2VyID0gUmV2aWV3ZXIoJ1Rlc3Qg VHdvJywgWyd0d29AdGVzdC5jb20nLCAnVHdvQHJhZC5jb20nLCAnc29fdHdvQGdtYWlsLmNvbSdd KQogICAgICAgICBjb250cmlidXRvciA9IENvbnRyaWJ1dG9yKCdUZXN0IFRocmVlJywgWydUaHJl ZUB0ZXN0LmNvbSddLCAndGhyZWUnKQogICAgICAgICBjb250cmlidXRvcl93aXRoX3R3b19uaWNr bmFtZXMgPSBDb250cmlidXRvcignT3RoZXIgRm91cicsIFsnb3RoZXJmb3VyQHdlYmtpdC5vcmcn XSwgWydmb3VyJywgJ290aGVyZm91ciddKQotICAgICAgICBjb21taXR0ZXJfbGlzdCA9IENvbW1p dHRlckxpc3QoY29tbWl0dGVycz1bY29tbWl0dGVyXSwgcmV2aWV3ZXJzPVtyZXZpZXdlcl0sIGNv bnRyaWJ1dG9ycz1bY29udHJpYnV0b3IsIGNvbnRyaWJ1dG9yX3dpdGhfdHdvX25pY2tuYW1lc10p CisgICAgICAgIGNvbW1pdHRlcl9saXN0ID0gQ29tbWl0dGVyTGlzdCh3YXRjaGVycz1bYWNjb3Vu dF0sIGNvbW1pdHRlcnM9W2NvbW1pdHRlcl0sIHJldmlld2Vycz1bcmV2aWV3ZXJdLCBjb250cmli dXRvcnM9W2NvbnRyaWJ1dG9yLCBjb250cmlidXRvcl93aXRoX3R3b19uaWNrbmFtZXNdKQogCiAg ICAgICAgICMgVGVzdCB2YWxpZCBjb21taXR0ZXIsIHJldmlld2VyIGFuZCBjb250cmlidXRvciBs b29rdXAKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5hY2NvdW50X2J5 X2VtYWlsKCd6ZXJvQHRlc3QuY29tJyksIGFjY291bnQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X2VtYWlsKCdvbmVAdGVzdC5jb20nKSwgY29t bWl0dGVyKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LnJldmlld2Vy X2J5X2VtYWlsKCd0d29AdGVzdC5jb20nKSwgcmV2aWV3ZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X2VtYWlsKCd0d29AdGVzdC5jb20nKSwg cmV2aWV3ZXIpCkBAIC01NCw2ICs1NiwxNCBAQCBjbGFzcyBDb21taXR0ZXJzVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgICMgVGVzdCB0aGF0IHRoZSBmaXJzdCBlbWFpbCBpcyBhc3N1 bWVkIHRvIGJlIHRoZSBCdWd6aWxsYSBlbWFpbCBhZGRyZXNzIChmb3Igbm93KQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbW1pdHRlcl9ieV9lbWFpbCgndHdvQHJh ZC5jb20nKS5idWd6aWxsYV9lbWFpbCgpLCAndHdvQHRlc3QuY29tJykKIAorICAgICAgICAjIFRl c3QgbG9va3VwIGJ5IGxvZ2luIGVtYWlsIGFkZHJlc3MKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChjb21taXR0ZXJfbGlzdC5hY2NvdW50X2J5X2xvZ2luKCd6ZXJvQHRlc3QuY29tJyksIGFjY291 bnQpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuYWNjb3VudF9ieV9s b2dpbignemVyb0BnbWFpbC5jb20nKSwgTm9uZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChj b21taXR0ZXJfbGlzdC5hY2NvdW50X2J5X2xvZ2luKCdvbmVAdGVzdC5jb20nKSwgY29tbWl0dGVy KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmFjY291bnRfYnlfbG9n aW4oJ3R3b0B0ZXN0LmNvbScpLCByZXZpZXdlcikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChj b21taXR0ZXJfbGlzdC5hY2NvdW50X2J5X2xvZ2luKCdUd29AcmFkLmNvbScpLCBOb25lKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmFjY291bnRfYnlfbG9naW4oJ3Nv X3R3b0BnbWFpbC5jb20nKSwgTm9uZSkKKwogICAgICAgICAjIFRlc3QgdGhhdCBhIGtub3duIGNv bW1pdHRlciBpcyBub3QgcmV0dXJuZWQgZHVyaW5nIHJldmlld2VyIGxvb2t1cAogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LnJldmlld2VyX2J5X2VtYWlsKCdvbmVAdGVz dC5jb20nKSwgTm9uZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5y ZXZpZXdlcl9ieV9lbWFpbCgndGhyZWVAdGVzdC5jb20nKSwgTm9uZSkKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy93YXRjaGxpc3QgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvd2F0Y2hsaXN0CmluZGV4IDNkY2I5N2M0OTk3ZDg4 OGI2NzY0MjIxZDc1YzYzYTk4NWNhNTk1OTIuLmFlNjA5OTNjMjRhNTZlYzZkODQwOTYzM2M2NWNk YjQ0MzI0NjMzOTMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy93YXRjaGxpc3QKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmln L3dhdGNobGlzdApAQCAtMTE1LDcgKzExNSw3IEBACiAgICAgICAgICMgU3BlY2lmaWNhbGx5LCBs ZXZpbkBjaHJvbWl1bS5vcmcgYW5kIGxldmluK3RocmVhZGluZ0BjaHJvbWl1bS5vcmcgYXJlCiAg ICAgICAgICMgdHdvIGRpZmZlcmVudCBhY2NvdW50cyBhcyBmYXIgYXMgYnVnemlsbGEgaXMgY29u Y2VybmVkLgogICAgICAgICAiQ2hyb21pdW1EdW1wUmVuZGVyVHJlZSI6IFsgInRrZW50QGNocm9t aXVtLm9yZyIsIF0sCi0gICAgICAgICJDaHJvbWl1bUdyYXBoaWNzIjogWyAiamFtZXNyQGNocm9t aXVtLm9yZyIsIF0sCisgICAgICAgICJDaHJvbWl1bUdyYXBoaWNzIjogWyAiamFtZXNyQGNocm9t aXVtLm9yZyIsICJjYy1idWdzQGdvb2dsZS5jb20iIF0sCiAgICAgICAgICJDaHJvbWl1bVB1Ymxp Y0FwaSI6IFsgImZpc2hkQGNocm9taXVtLm9yZyIsIF0sCiAgICAgICAgICJGb3JtcyI6IFsgInRr ZW50QGNocm9taXVtLm9yZyIsIF0sCiAgICAgICAgICJHU3RyZWFtZXJHcmFwaGljcyI6IFsgInBu b3JtYW5kQGlnYWxpYS5jb20iLCBdLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXIucHkKaW5kZXggNWU0YWZiNjk3 MTU0MjAyMzZkMjU5OGFkNDQwNTIxMDMwYmYzMWVlOS4uYzcyZWFiMzZlYTQ0OWQ1NTYwMTY5MDNk NWJmN2IwOTRlNDZlZGUzYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyLnB5CkBAIC0xNDYsMTMgKzE0Niwx MyBAQCBjbGFzcyBXYXRjaExpc3RQYXJzZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fdmFsaWRh dGVfZGVmaW5pdGlvbnMoY2NfZGVmaW5pdGlvbnNfc2V0LCBzZWxmLl9DQ19SVUxFUywgd2F0Y2hf bGlzdCkKICAgICAgICAgc2VsZi5fdmFsaWRhdGVfZGVmaW5pdGlvbnMobWVzc2FnZXNfZGVmaW5p dGlvbnNfc2V0LCBzZWxmLl9NRVNTQUdFX1JVTEVTLCB3YXRjaF9saXN0KQogCi0gICAgICAgIGNv bnRyaWJ1dG9ycyA9IENvbW1pdHRlckxpc3QoKQorICAgICAgICBhY2NvdW50cyA9IENvbW1pdHRl ckxpc3QoKQogICAgICAgICBmb3IgY2NfcnVsZSBpbiB3YXRjaF9saXN0LmNjX3J1bGVzOgogICAg ICAgICAgICAgIyBDb3B5IHRoZSBpbnN0cnVjdGlvbnMgc2luY2Ugd2UnbGwgYmUgcmVtb3ZlIGl0 ZW1zIGZyb20gdGhlIG9yaWdpbmFsIGxpc3QgYW5kCiAgICAgICAgICAgICAjIG1vZGlmeWluZyBh IGxpc3Qgd2hpbGUgaXRlcmF0aW5nIHRocm91Z2ggaXQgbGVhZHMgdG8gdW5kZWZpbmVkIGJlaGF2 aW9yLgogICAgICAgICAgICAgaW50cnVjdGlvbnNfY29weSA9IGNjX3J1bGUuaW5zdHJ1Y3Rpb25z KClbOl0KICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBpbnRydWN0aW9uc19jb3B5OgotICAgICAg ICAgICAgICAgIGlmIG5vdCBjb250cmlidXRvcnMuY29udHJpYnV0b3JfYnlfZW1haWwoZW1haWwp OgorICAgICAgICAgICAgICAgIGlmIG5vdCBhY2NvdW50cy5hY2NvdW50X2J5X2xvZ2luKGVtYWls KToKICAgICAgICAgICAgICAgICAgICAgY2NfcnVsZS5yZW1vdmVfaW5zdHJ1Y3Rpb24oZW1haWwp CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2xvZ19lcnJvcigiVGhlIGVtYWlsIGFsaWFzICVz IHdoaWNoIGlzIGluIHRoZSB3YXRjaGxpc3QgaXMgbm90IGxpc3RlZCBhcyBhIGNvbnRyaWJ1dG9y IGluIGNvbW1pdHRlcnMucHkiICUgZW1haWwpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVl Cg==