218067 2020-10-21 19:04:33 -0700 webkitpy: Add a --no-comment switch to webkit-patch land 2020-11-06 09:04:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 clopez clopez aakash_jain ap dewei_zhu ews-watchlist glenn jbedard rniwa ross.kirsling webkit-bug-importer oldest_to_newest 1700517 0 clopez 2020-10-21 19:04:33 -0700 When using webkit-patch land to land a local patch, the tool always comment on the bug that is pointed on the changelog. Sometimes I find desirable to not add a comment automatically, for example when landing a gardening patch or a build-fix patch where I use the original bug that caused the issue on the changelog. I prefer to add manually a comment after landing the patch, but the tool doesn't me allow to skip adding this automatic comment. 1700519 1 412060 clopez 2020-10-21 19:08:42 -0700 Created attachment 412060 Patch 1700540 2 412060 rniwa 2020-10-21 22:08:44 -0700 Comment on attachment 412060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412060&action=review > Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py:59 > + _log.info("Closing without commenting bug %s" % bug_id) > + self._tool.bugs.close_bug_as_fixed(bug_id) It's not great to close a bug without commenting. We should probably not close the bug or leave a comment regardless of the option in this case. 1700609 3 aakash_jain 2020-10-22 06:10:19 -0700 Agree with Ryosuke. It doesn't seems like a good idea to close a bug without commenting. People can forget to add a manual comment later on, or miss including the specific commit link in the comment. Also the use-case isn't very clear to me. Can you please give some specific examples where such a functionality of no-comment was required? In case of a build-fix commit, what's the problem in adding the automated comment (which includes the link to the fix)? The comment will let people watching that bug know immediately that a fix has been landed. 1700613 4 clopez 2020-10-22 06:22:30 -0700 (In reply to Aakash Jain from comment #3) > Also the use-case isn't very clear to me. Can you please give some specific > examples where such a functionality of no-comment was required? > In case of a build-fix commit, what's the problem in adding the automated > comment (which includes the link to the fix)? The comment will let people > watching that bug know immediately that a fix has been landed. Example: https://bugs.webkit.org/show_bug.cgi?id=218017#c11 I usually prefer to give some context along with the commit number on the bugs, so I end commenting twice because the tool forces to leave that automatic comment with just the commit number. Note that this will be an optional switch, the one using it would do that on purpose so I expect she will be diligent enough to put her own comment on time. 1702590 5 webkit-bug-importer 2020-10-28 19:05:16 -0700 <rdar://problem/70790813> 1703589 6 aakash_jain 2020-11-02 10:46:58 -0800 (In reply to Carlos Alberto Lopez Perez from comment #4) > I usually prefer to give some context along with the commit number on the bugs, so I end commenting twice because the tool forces to leave that automatic comment with just the commit number. You also have the option to use 'svn commit' directly if you don't want 'webkit-patch land' to interact with the bug. Is there any specific benefit of using 'webkit-patch land' over 'svn commit' if you don't want Bugzilla interaction. 1703596 7 jbedard 2020-11-02 10:54:40 -0800 (In reply to Aakash Jain from comment #6) > (In reply to Carlos Alberto Lopez Perez from comment #4) > > I usually prefer to give some context along with the commit number on the bugs, so I end commenting twice because the tool forces to leave that automatic comment with just the commit number. > You also have the option to use 'svn commit' directly if you don't want > 'webkit-patch land' to interact with the bug. Is there any specific benefit > of using 'webkit-patch land' over 'svn commit' if you don't want Bugzilla > interaction. I'm not sure we should encourage folks to use svn commit directly, that bypasses adding the commit message. Not a huge deal for SVN, but a pretty big problem for the Git future we're working towards. 1703610 8 jbedard 2020-11-02 11:13:23 -0800 I think Carlos has a good use case here. I want to give Ryosuke and Aakash a chance to rebuttal, but "I want to comment on Bugzilla myself" seems like a valid use case....and I would much rather an engineer use webkit-patch in that case instead of committing directly. 1703626 9 412060 rniwa 2020-11-02 11:47:48 -0800 Comment on attachment 412060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412060&action=review >> Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py:59 >> + self._tool.bugs.close_bug_as_fixed(bug_id) > > It's not great to close a bug without commenting. > We should probably not close the bug or leave a comment regardless of the option in this case. r- because of this point. 1703683 10 412967 clopez 2020-11-02 13:58:46 -0800 Created attachment 412967 Patch v2: dont close the bug without commenting 1705265 11 412967 clopez 2020-11-06 09:04:15 -0800 Comment on attachment 412967 Patch Clearing flags on attachment: 412967 Committed r269513: <https://trac.webkit.org/changeset/269513> 1705266 12 clopez 2020-11-06 09:04:19 -0800 All reviewed patches have been landed. Closing bug. 412060 2020-10-21 19:08:42 -0700 2020-11-02 13:58:42 -0800 Patch bug-218067-20201022040841.patch text/plain 8863 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4ODUwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2QzNDg2ZmFjNTQyOTJhZjM2NWQzZjUxMjQ5Mzc3OTI2 YmQyYzQ3MS4uYTAyYzYxODhmMmMzNWYwODljOWRhYzRkNDFkNGE1Y2VhNjM0YTZhNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDIwLTEwLTIxICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIHdlYmtpdHB5OiBBZGQgYSAtLW5vLWNvbW1lbnQgc3dpdGNoIHRv IHdlYmtpdC1wYXRjaCBsYW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTgwNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgYW4gb3B0aW9uYWwgLS1uby1jb21tZW50IHN3aXRjaCB0byB3ZWJraXQt cGF0Y2ggbGFuZC4KKyAgICAgICAgVGhpcyBpcyB1c2VmdWwgd2hlbiBsYW5kaW5nIGdhcmRlbmlu ZywgYnVpbGQtZml4ZXMgb3IgZm9sbG93LXVwIHBhdGNoZXMKKyAgICAgICAgb24gYSBidWcgYW5k IHlvdSBkb24ndCB3YW50IHRoZSB0b29sIHRvIGF1dG9tYXRpY2FsbHkgYWRkIGEgY29tbWVudCB3 aXRoCisgICAgICAgIHRoZSByZXZpc2lvbiBsYW5kZWQgYmVjYXVzZSB5b3UgcHJlZmZlciB0byBs YXRlciBhZGQgYSBjb21tZW50IG1hbnVhbGx5LgorCisgICAgICAgIE5vdGUgdGhhdCBpdCB3aWxs IHN0aWxsIGNsb3NlIHRoZSBidWcsIGlmIHlvdSBkb24ndCB3YW50IHRoZSBidWcgdG8KKyAgICAg ICAgYmUgY2xvc2VkIHlvdSBuZWVkIHRvIHBhc3MgYWxzbyAtLW5vLWNsb3NlLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX21vY2sucHk6 CisgICAgICAgIChNb2NrQnVnemlsbGEuY2xvc2VfYnVnX2FzX2ZpeGVkKToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3QucHk6CisgICAg ICAgIChEb3dubG9hZENvbW1hbmRzVGVzdC5fZGVmYXVsdF9vcHRpb25zKToKKyAgICAgICAgKHRl c3RfbGFuZF9ub19jbG9zZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBz L2Nsb3NlYnVnZm9ybGFuZGRpZmYucHk6CisgICAgICAgIChDbG9zZUJ1Z0ZvckxhbmREaWZmLm9w dGlvbnMpOgorICAgICAgICAoQ2xvc2VCdWdGb3JMYW5kRGlmZi5ydW4pOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5OgorICAgICAgICAoT3B0aW9ucyk6 CisKIDIwMjAtMTAtMjEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgSVBDIHRlc3RpbmcgQVBJIHNob3VsZCBoYXZlIHRoZSBjYXBhYmlsaXR5IHRvIG9ic2VydmUg bWVzc2FnZXMgYmVpbmcgc2VudCBhbmQgcmVjZWl2ZWQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYV9tb2NrLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX21vY2sucHkKaW5k ZXggOTQ4ZjU2YzgzMDEwMDNmZGViYzY3Mjc1MmRhMzljZWRmNzc0MGUyZC4uYjY5N2UwMDFmN2E0 YzRjMjA1ZDg5ZmJiNjZlY2M4ZTlmOTVmZTZlYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX21vY2sucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX21vY2sucHkKQEAg LTQ3Myw3ICs0NzMsNyBAQCBjbGFzcyBNb2NrQnVnemlsbGEob2JqZWN0KToKICAgICBkZWYgcmVv cGVuX2J1ZyhzZWxmLCBidWdfaWQsIG1lc3NhZ2UpOgogICAgICAgICBfbG9nLmluZm8oIk1PQ0sg cmVvcGVuX2J1ZyAlcyB3aXRoIGNvbW1lbnQgJyVzJyIgJSAoYnVnX2lkLCBtZXNzYWdlKSkKIAot ICAgIGRlZiBjbG9zZV9idWdfYXNfZml4ZWQoc2VsZiwgYnVnX2lkLCBtZXNzYWdlKToKKyAgICBk ZWYgY2xvc2VfYnVnX2FzX2ZpeGVkKHNlbGYsIGJ1Z19pZCwgY29tbWVudF90ZXh0PU5vbmUpOgog ICAgICAgICBwYXNzCiAKICAgICBkZWYgY2xlYXJfYXR0YWNobWVudF9mbGFncyhzZWxmLCBhdHRh Y2htZW50X2lkLCBtZXNzYWdlKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0dGVzdC5weQppbmRleCA2YTMxZWNhODhkMzIy ZWJjYWYyYmUxNGQ4OTI5YzI1YjY2YjA2NTJlLi42OWY2ZTU1NTFmZWMyYTY5OWI3NDY0ZTIxNGY0 OTEwMjZlYjhiNjJlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvZG93bmxvYWRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0ZXN0LnB5CkBAIC04NCw2ICs4NCw3IEBAIGNsYXNz IERvd25sb2FkQ29tbWFuZHNUZXN0KENvbW1hbmRzVGVzdCk6CiAgICAgICAgIG9wdGlvbnMuY2hl Y2tfc3R5bGVfZmlsdGVyID0gTm9uZQogICAgICAgICBvcHRpb25zLmNsZWFuID0gVHJ1ZQogICAg ICAgICBvcHRpb25zLmNsb3NlX2J1ZyA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5jb21tZW50X2J1 ZyA9IFRydWUKICAgICAgICAgb3B0aW9ucy5mb3JjZV9jbGVhbiA9IEZhbHNlCiAgICAgICAgIG9w dGlvbnMubm9uX2ludGVyYWN0aXZlID0gRmFsc2UKICAgICAgICAgb3B0aW9ucy5wYXJlbnRfY29t bWFuZCA9ICdNT0NLIHBhcmVudCBjb21tYW5kJwpAQCAtMTQ4LDcgKzE0OSw3IEBAIFJ1bm5pbmcg UGVybCB1bml0IHRlc3RzCiBSdW5uaW5nIEphdmFTY3JpcHRDb3JlIHRlc3RzCiBSdW5uaW5nIHJ1 bi13ZWJraXQtdGVzdHMKIENvbW1pdHRlZCByNDk4MjQ6IDxodHRwczovL3RyYWMud2Via2l0Lm9y Zy9jaGFuZ2VzZXQvNDk4MjQ+Ci1VcGRhdGluZyBidWcgNTAwMDAKK0FkZGluZyBjb21tZW50IGFu ZCBjbG9zaW5nIGJ1ZyA1MDAwMAogIiIiCiAgICAgICAgIG1vY2tfdG9vbCA9IE1vY2tUb29sKCkK ICAgICAgICAgbW9ja190b29sLnNjbSgpLmNyZWF0ZV9wYXRjaCA9IE1vY2socmV0dXJuX3ZhbHVl PSJQYXRjaDFcbk1vY2tQYXRjaFxuIikKQEAgLTE5MSw3ICsxOTIsNyBAQCBSdW5uaW5nIFBlcmwg dW5pdCB0ZXN0cwogUnVubmluZyBKYXZhU2NyaXB0Q29yZSB0ZXN0cwogUnVubmluZyBydW4td2Vi a2l0LXRlc3RzCiBDb21taXR0ZWQgcjQ5ODI0OiA8aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzQ5ODI0PgotVXBkYXRpbmcgYnVnIDUwMDAwCitBZGRpbmcgY29tbWVudCBhbmQgY2xv c2luZyBidWcgNTAwMDAKICIiIgogICAgICAgICBtb2NrX3Rvb2wgPSBNb2NrVG9vbCgpCiAgICAg ICAgIG1vY2tfdG9vbC5idWlsZGJvdC5saWdodF90cmVlX29uX2ZpcmUoKQpAQCAtMjc1LDYgKzI3 Niw1MCBAQCBOb3QgY2xvc2luZyBidWcgNTAwMDAgYXMgYXR0YWNobWVudCAxMDAwMCBoYXMgcmV2 aWV3PSsuICBBc3N1bWluZyB0aGVyZSBhcmUgbW9yZQogIiIiCiAgICAgICAgIHNlbGYuYXNzZXJ0 X2V4ZWN1dGVfb3V0cHV0cyhMYW5kRnJvbVVSTCgpLCBbImh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MDAwMCJdLCBvcHRpb25zPXNlbGYuX2RlZmF1bHRfb3B0aW9ucygp LCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpCiAKKyAgICBkZWYgdGVzdF9sYW5kX25vX2Nv bW1lbnQoc2VsZik6CisgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiIiJCdWlsZGluZyBXZWJLaXQK K1J1bm5pbmcgUHl0aG9uIHVuaXQgdGVzdHMKK1J1bm5pbmcgUGVybCB1bml0IHRlc3RzCitSdW5u aW5nIEphdmFTY3JpcHRDb3JlIHRlc3RzCitSdW5uaW5nIHJ1bi13ZWJraXQtdGVzdHMKK0NvbW1p dHRlZCByNDk4MjQ6IDxodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNDk4MjQ+CitD bG9zaW5nIHdpdGhvdXQgY29tbWVudGluZyBidWcgNTAwMDAKKyIiIgorICAgICAgICBvcHRpb25z ID0gc2VsZi5fZGVmYXVsdF9vcHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5jb21tZW50X2J1ZyA9 IEZhbHNlCisgICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhMYW5kKCksIFs1MDAw MF0sIG9wdGlvbnM9b3B0aW9ucywgZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQorCisgICAg ZGVmIHRlc3RfbGFuZF9ub19jbG9zZShzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICIi IkJ1aWxkaW5nIFdlYktpdAorUnVubmluZyBQeXRob24gdW5pdCB0ZXN0cworUnVubmluZyBQZXJs IHVuaXQgdGVzdHMKK1J1bm5pbmcgSmF2YVNjcmlwdENvcmUgdGVzdHMKK1J1bm5pbmcgcnVuLXdl YmtpdC10ZXN0cworQ29tbWl0dGVkIHI0OTgyNDogPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC80OTgyND4KK0NvbW1lbnRpbmcgd2l0aG91dCBjbG9zaW5nIGJ1ZyA1MDAwMAorTU9D SyBidWcgY29tbWVudDogYnVnX2lkPTUwMDAwLCBjYz1Ob25lLCBzZWVfYWxzbz1Ob25lCistLS0g QmVnaW4gY29tbWVudCAtLS0KK0NvbW1pdHRlZCByNDk4MjQ6IDxodHRwczovL3RyYWMud2Via2l0 Lm9yZy9jaGFuZ2VzZXQvNDk4MjQ+CistLS0gRW5kIGNvbW1lbnQgLS0tCisKKyIiIgorICAgICAg ICBvcHRpb25zID0gc2VsZi5fZGVmYXVsdF9vcHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5jbG9z ZV9idWcgPSBGYWxzZQorICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoTGFuZCgp LCBbNTAwMDBdLCBvcHRpb25zPW9wdGlvbnMsIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykK KworICAgIGRlZiB0ZXN0X2xhbmRfbm9fY29tbWVudF9ub19jbG9zZShzZWxmKToKKyAgICAgICAg ZXhwZWN0ZWRfbG9ncyA9ICIiIkJ1aWxkaW5nIFdlYktpdAorUnVubmluZyBQeXRob24gdW5pdCB0 ZXN0cworUnVubmluZyBQZXJsIHVuaXQgdGVzdHMKK1J1bm5pbmcgSmF2YVNjcmlwdENvcmUgdGVz dHMKK1J1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cworQ29tbWl0dGVkIHI0OTgyNDogPGh0dHBzOi8v dHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC80OTgyND4KKyIiIgorICAgICAgICBvcHRpb25zID0g c2VsZi5fZGVmYXVsdF9vcHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5jb21tZW50X2J1ZyA9IEZh bHNlCisgICAgICAgIG9wdGlvbnMuY2xvc2VfYnVnID0gRmFsc2UKKyAgICAgICAgc2VsZi5hc3Nl cnRfZXhlY3V0ZV9vdXRwdXRzKExhbmQoKSwgWzUwMDAwXSwgb3B0aW9ucz1vcHRpb25zLCBleHBl Y3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpCisKICAgICBkZWYgdGVzdF9wcmVwYXJlX3JldmVydChz ZWxmKToKICAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICJQcmVwYXJpbmcgcmV2ZXJ0IGZvciBidWcg NTAwMDAuXG5VcGRhdGluZyB3b3JraW5nIGRpcmVjdG9yeVxuIgogICAgICAgICBzZWxmLmFzc2Vy dF9leGVjdXRlX291dHB1dHMoUHJlcGFyZVJldmVydCgpLCBbODUyLCAiUmVhc29uIl0sIG9wdGlv bnM9c2VsZi5fZGVmYXVsdF9vcHRpb25zKCksIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jbG9zZWJ1Z2Zv cmxhbmRkaWZmLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Nsb3NlYnVn Zm9ybGFuZGRpZmYucHkKaW5kZXggZGE4ZTdjNDU3NWFmNTkzYThmNTM3ZGM3Y2ViMzEzN2I0NWE1 NzhlYi4uMmZjNDdkZDkwNzM4ZTdhNTlhYmE4MThmNzE5NWFhM2RiM2JmMzhkMyAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Nsb3NlYnVnZm9ybGFuZGRpZmYu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Nsb3NlYnVnZm9ybGFu ZGRpZmYucHkKQEAgLTQwLDYgKzQwLDcgQEAgY2xhc3MgQ2xvc2VCdWdGb3JMYW5kRGlmZihBYnN0 cmFjdFN0ZXApOgogICAgIGRlZiBvcHRpb25zKGNscyk6CiAgICAgICAgIHJldHVybiBBYnN0cmFj dFN0ZXAub3B0aW9ucygpICsgWwogICAgICAgICAgICAgT3B0aW9ucy5jbG9zZV9idWcsCisgICAg ICAgICAgICBPcHRpb25zLmNvbW1lbnRfYnVnLAogICAgICAgICBdCiAKICAgICBkZWYgcnVuKHNl bGYsIHN0YXRlKToKQEAgLTQ5LDEzICs1MCwxNyBAQCBjbGFzcyBDbG9zZUJ1Z0ZvckxhbmREaWZm KEFic3RyYWN0U3RlcCk6CiAgICAgICAgICAgICBidWdfaWQgPSBzdGF0ZS5nZXQoInBhdGNoIiku YnVnX2lkKCkKIAogICAgICAgICBpZiBidWdfaWQ6Ci0gICAgICAgICAgICBfbG9nLmluZm8oIlVw ZGF0aW5nIGJ1ZyAlcyIgJSBidWdfaWQpCiAgICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmNs b3NlX2J1ZzoKLSAgICAgICAgICAgICAgICBzZWxmLl90b29sLmJ1Z3MuY2xvc2VfYnVnX2FzX2Zp eGVkKGJ1Z19pZCwgY29tbWVudF90ZXh0KQorICAgICAgICAgICAgICAgIGlmIHNlbGYuX29wdGlv bnMuY29tbWVudF9idWc6CisgICAgICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiQWRkaW5nIGNv bW1lbnQgYW5kIGNsb3NpbmcgYnVnICVzIiAlIGJ1Z19pZCkKKyAgICAgICAgICAgICAgICAgICAg c2VsZi5fdG9vbC5idWdzLmNsb3NlX2J1Z19hc19maXhlZChidWdfaWQsIGNvbW1lbnRfdGV4dCkK KyAgICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICBfbG9nLmluZm8oIkNs b3Npbmcgd2l0aG91dCBjb21tZW50aW5nIGJ1ZyAlcyIgJSBidWdfaWQpCisgICAgICAgICAgICAg ICAgICAgIHNlbGYuX3Rvb2wuYnVncy5jbG9zZV9idWdfYXNfZml4ZWQoYnVnX2lkKQogICAgICAg ICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgYSBzbWFydCB3 YXkgdG8gZmlndXJlIG91dCBpZiB0aGUgcGF0Y2ggaXMgYXR0YWNoZWQKLSAgICAgICAgICAgICAg ICAjIHRvIHRoZSBidWcsIGFuZCBpZiBzbyBvYnNvbGV0ZSBpdC4KLSAgICAgICAgICAgICAgICBz ZWxmLl90b29sLmJ1Z3MucG9zdF9jb21tZW50X3RvX2J1ZyhidWdfaWQsIGNvbW1lbnRfdGV4dCkK KyAgICAgICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmNvbW1lbnRfYnVnOgorICAgICAgICAg ICAgICAgICAgICBfbG9nLmluZm8oIkNvbW1lbnRpbmcgd2l0aG91dCBjbG9zaW5nIGJ1ZyAlcyIg JSBidWdfaWQpCisgICAgICAgICAgICAgICAgICAgIHNlbGYuX3Rvb2wuYnVncy5wb3N0X2NvbW1l bnRfdG9fYnVnKGJ1Z19pZCwgY29tbWVudF90ZXh0KQogICAgICAgICBlbHNlOgogICAgICAgICAg ICAgX2xvZy5pbmZvKGNvbW1lbnRfdGV4dCkKICAgICAgICAgICAgIF9sb2cuaW5mbygiTm8gYnVn IGlkIHByb3ZpZGVkLiIpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvb3B0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRp b25zLnB5CmluZGV4IDQ1MjJhMWI5MmJlNGM4NWUwZTM4M2RhODUxZjM0MWNhMjlmNmYwZGUuLjRj YTFlYzk2ZTU0OWJjYzYzYzUxMjBlMjRmNWZkMzlmODZiNmZmYzggMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5CkBAIC00MSw2ICs0MSw3IEBAIGNsYXNz IE9wdGlvbnMob2JqZWN0KToKICAgICBjaGVja19zdHlsZV9maWx0ZXIgPSBtYWtlX29wdGlvbigi LS1jaGVjay1zdHlsZS1maWx0ZXIiLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3RyaW5nIiwgZGVz dD0iY2hlY2tfc3R5bGVfZmlsdGVyIiwgZGVmYXVsdD1Ob25lLCBoZWxwPSJGaWx0ZXIgc3R5bGUt Y2hlY2tlciBydWxlcyAoc2VlIGNoZWNrLXdlYmtpdC1zdHlsZSAtLWhlbHApLiIpCiAgICAgY2xl YW4gPSBtYWtlX29wdGlvbigiLS1uby1jbGVhbiIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0 PSJjbGVhbiIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG9uJ3QgY2hlY2sgaWYgdGhlIHdvcmtpbmcg ZGlyZWN0b3J5IGlzIGNsZWFuIGJlZm9yZSBhcHBseWluZyBwYXRjaGVzIikKICAgICBjbG9zZV9i dWcgPSBtYWtlX29wdGlvbigiLS1uby1jbG9zZSIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0 PSJjbG9zZV9idWciLCBkZWZhdWx0PVRydWUsIGhlbHA9IkxlYXZlIGJ1ZyBvcGVuIGFmdGVyIGxh bmRpbmcuIikKKyAgICBjb21tZW50X2J1ZyA9IG1ha2Vfb3B0aW9uKCItLW5vLWNvbW1lbnQiLCBh Y3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iY29tbWVudF9idWciLCBkZWZhdWx0PVRydWUsIGhl bHA9IkRvbid0IGFkZCBhIGNvbW1lbnQgb24gdGhlIGJ1ZyBhZnRlciBsYW5kaW5nLiIpCiAgICAg Y29tbWVudCA9IG1ha2Vfb3B0aW9uKCItLWNvbW1lbnQiLCBhY3Rpb249InN0b3JlIiwgdHlwZT0i c3RyaW5nIiwgZGVzdD0iY29tbWVudCIsIGhlbHA9IkNvbW1lbnQgdG8gcG9zdCB0byBidWcuIikK ICAgICBjb21wb25lbnQgPSBtYWtlX29wdGlvbigiLS1jb21wb25lbnQiLCBhY3Rpb249InN0b3Jl IiwgdHlwZT0ic3RyaW5nIiwgZGVzdD0iY29tcG9uZW50IiwgaGVscD0iQ29tcG9uZW50IGZvciB0 aGUgbmV3IGJ1Zy4iKQogICAgIGNvbmZpcm0gPSBtYWtlX29wdGlvbigiLS1uby1jb25maXJtIiwg YWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNvbmZpcm0iLCBkZWZhdWx0PVRydWUsIGhlbHA9 IlNraXAgY29uZmlybWF0aW9uIHN0ZXBzLiIpCg== 412967 2020-11-02 13:58:46 -0800 2020-11-06 09:04:15 -0800 Patch bug-218067-20201102225845.patch text/plain 8724 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzA1ZDViMDkwMmViYzg3NTU5ZjEyNjMxMDZjYjE4MmNm NGNkOTRlNC4uYzkxZTRmZDViYmM1NGUzZTI3NzE0NTA3MDVlZGUwNWYwZGFlYzNjYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDIwLTExLTAyICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIHdlYmtpdHB5OiBBZGQgYSAtLW5vLWNvbW1lbnQgc3dpdGNoIHRv IHdlYmtpdC1wYXRjaCBsYW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTgwNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgYW4gb3B0aW9uYWwgLS1uby1jb21tZW50IHN3aXRjaCB0byB3ZWJraXQt cGF0Y2ggbGFuZC4KKyAgICAgICAgVGhpcyBpcyB1c2VmdWwgd2hlbiBsYW5kaW5nIGdhcmRlbmlu ZywgYnVpbGQtZml4ZXMgb3IgZm9sbG93LXVwIHBhdGNoZXMKKyAgICAgICAgb24gYSBidWcgYW5k IHlvdSBkb24ndCB3YW50IHRoZSB0b29sIHRvIGF1dG9tYXRpY2FsbHkgYWRkIGEgY29tbWVudCB3 aXRoCisgICAgICAgIHRoZSByZXZpc2lvbiBsYW5kZWQgYmVjYXVzZSB5b3UgcHJlZmZlciB0byBs YXRlciBhZGQgYSBjb21tZW50IG1hbnVhbGx5LgorCisgICAgICAgIE5vdGUgdGhhdCBpdCB3aWxs IHN0aWxsIGNsb3NlIHRoZSBidWcsIGlmIHlvdSBkb24ndCB3YW50IHRoZSBidWcgdG8KKyAgICAg ICAgYmUgY2xvc2VkIHlvdSBuZWVkIHRvIHBhc3MgYWxzbyAtLW5vLWNsb3NlLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX21vY2sucHk6 CisgICAgICAgIChNb2NrQnVnemlsbGEuY2xvc2VfYnVnX2FzX2ZpeGVkKToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3QucHk6CisgICAg ICAgIChEb3dubG9hZENvbW1hbmRzVGVzdC5fZGVmYXVsdF9vcHRpb25zKToKKyAgICAgICAgKHRl c3RfbGFuZF9ub19jbG9zZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBz L2Nsb3NlYnVnZm9ybGFuZGRpZmYucHk6CisgICAgICAgIChDbG9zZUJ1Z0ZvckxhbmREaWZmLm9w dGlvbnMpOgorICAgICAgICAoQ2xvc2VCdWdGb3JMYW5kRGlmZi5ydW4pOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5OgorICAgICAgICAoT3B0aW9ucyk6 CisKIDIwMjAtMTEtMDIgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBTb3J0IFhjb2RlIHByb2plY3QgZmlsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX21vY2sucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfbW9jay5weQppbmRleCA5 NDhmNTZjODMwMTAwM2ZkZWJjNjcyNzUyZGEzOWNlZGY3NzQwZTJkLi5iNjk3ZTAwMWY3YTRjNGMy MDVkODlmYmI2NmVjYzhlOWY5NWZlNmViIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfbW9jay5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfbW9jay5weQpAQCAtNDcz LDcgKzQ3Myw3IEBAIGNsYXNzIE1vY2tCdWd6aWxsYShvYmplY3QpOgogICAgIGRlZiByZW9wZW5f YnVnKHNlbGYsIGJ1Z19pZCwgbWVzc2FnZSk6CiAgICAgICAgIF9sb2cuaW5mbygiTU9DSyByZW9w ZW5fYnVnICVzIHdpdGggY29tbWVudCAnJXMnIiAlIChidWdfaWQsIG1lc3NhZ2UpKQogCi0gICAg ZGVmIGNsb3NlX2J1Z19hc19maXhlZChzZWxmLCBidWdfaWQsIG1lc3NhZ2UpOgorICAgIGRlZiBj bG9zZV9idWdfYXNfZml4ZWQoc2VsZiwgYnVnX2lkLCBjb21tZW50X3RleHQ9Tm9uZSk6CiAgICAg ICAgIHBhc3MKIAogICAgIGRlZiBjbGVhcl9hdHRhY2htZW50X2ZsYWdzKHNlbGYsIGF0dGFjaG1l bnRfaWQsIG1lc3NhZ2UpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0ZXN0LnB5CmluZGV4IDZhMzFlY2E4OGQzMjJlYmNh ZjJiZTE0ZDg5MjljMjViNjZiMDY1MmUuLjI0YmMxNTgzY2JjYWViNzliNjUzZGQzYTQxM2I3ZmZk MzYyMmQ3MmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9kb3dubG9hZF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3QucHkKQEAgLTg0LDYgKzg0LDcgQEAgY2xhc3MgRG93 bmxvYWRDb21tYW5kc1Rlc3QoQ29tbWFuZHNUZXN0KToKICAgICAgICAgb3B0aW9ucy5jaGVja19z dHlsZV9maWx0ZXIgPSBOb25lCiAgICAgICAgIG9wdGlvbnMuY2xlYW4gPSBUcnVlCiAgICAgICAg IG9wdGlvbnMuY2xvc2VfYnVnID0gVHJ1ZQorICAgICAgICBvcHRpb25zLmNvbW1lbnRfYnVnID0g VHJ1ZQogICAgICAgICBvcHRpb25zLmZvcmNlX2NsZWFuID0gRmFsc2UKICAgICAgICAgb3B0aW9u cy5ub25faW50ZXJhY3RpdmUgPSBGYWxzZQogICAgICAgICBvcHRpb25zLnBhcmVudF9jb21tYW5k ID0gJ01PQ0sgcGFyZW50IGNvbW1hbmQnCkBAIC0xNDgsNyArMTQ5LDcgQEAgUnVubmluZyBQZXJs IHVuaXQgdGVzdHMKIFJ1bm5pbmcgSmF2YVNjcmlwdENvcmUgdGVzdHMKIFJ1bm5pbmcgcnVuLXdl YmtpdC10ZXN0cwogQ29tbWl0dGVkIHI0OTgyNDogPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC80OTgyND4KLVVwZGF0aW5nIGJ1ZyA1MDAwMAorQWRkaW5nIGNvbW1lbnQgYW5kIGNs b3NpbmcgYnVnIDUwMDAwCiAiIiIKICAgICAgICAgbW9ja190b29sID0gTW9ja1Rvb2woKQogICAg ICAgICBtb2NrX3Rvb2wuc2NtKCkuY3JlYXRlX3BhdGNoID0gTW9jayhyZXR1cm5fdmFsdWU9IlBh dGNoMVxuTW9ja1BhdGNoXG4iKQpAQCAtMTkxLDcgKzE5Miw3IEBAIFJ1bm5pbmcgUGVybCB1bml0 IHRlc3RzCiBSdW5uaW5nIEphdmFTY3JpcHRDb3JlIHRlc3RzCiBSdW5uaW5nIHJ1bi13ZWJraXQt dGVzdHMKIENvbW1pdHRlZCByNDk4MjQ6IDxodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2Vz ZXQvNDk4MjQ+Ci1VcGRhdGluZyBidWcgNTAwMDAKK0FkZGluZyBjb21tZW50IGFuZCBjbG9zaW5n IGJ1ZyA1MDAwMAogIiIiCiAgICAgICAgIG1vY2tfdG9vbCA9IE1vY2tUb29sKCkKICAgICAgICAg bW9ja190b29sLmJ1aWxkYm90LmxpZ2h0X3RyZWVfb25fZmlyZSgpCkBAIC0yNzUsNiArMjc2LDUx IEBAIE5vdCBjbG9zaW5nIGJ1ZyA1MDAwMCBhcyBhdHRhY2htZW50IDEwMDAwIGhhcyByZXZpZXc9 Ky4gIEFzc3VtaW5nIHRoZXJlIGFyZSBtb3JlCiAiIiIKICAgICAgICAgc2VsZi5hc3NlcnRfZXhl Y3V0ZV9vdXRwdXRzKExhbmRGcm9tVVJMKCksIFsiaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTUwMDAwIl0sIG9wdGlvbnM9c2VsZi5fZGVmYXVsdF9vcHRpb25zKCksIGV4 cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKIAorICAgIGRlZiB0ZXN0X2xhbmRfbm9fY29tbWVu dChzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICIiIkJ1aWxkaW5nIFdlYktpdAorUnVu bmluZyBQeXRob24gdW5pdCB0ZXN0cworUnVubmluZyBQZXJsIHVuaXQgdGVzdHMKK1J1bm5pbmcg SmF2YVNjcmlwdENvcmUgdGVzdHMKK1J1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cworQ29tbWl0dGVk IHI0OTgyNDogPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC80OTgyND4KK05vdCB1 cGRhdGluZyBidWcgNTAwMDAKKyIiIgorICAgICAgICBvcHRpb25zID0gc2VsZi5fZGVmYXVsdF9v cHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5jb21tZW50X2J1ZyA9IEZhbHNlCisgICAgICAgIHNl bGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhMYW5kKCksIFs1MDAwMF0sIG9wdGlvbnM9b3B0aW9u cywgZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQorCisgICAgZGVmIHRlc3RfbGFuZF9ub19j bG9zZShzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICIiIkJ1aWxkaW5nIFdlYktpdAor UnVubmluZyBQeXRob24gdW5pdCB0ZXN0cworUnVubmluZyBQZXJsIHVuaXQgdGVzdHMKK1J1bm5p bmcgSmF2YVNjcmlwdENvcmUgdGVzdHMKK1J1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cworQ29tbWl0 dGVkIHI0OTgyNDogPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC80OTgyND4KK0Nv bW1lbnRpbmcgd2l0aG91dCBjbG9zaW5nIGJ1ZyA1MDAwMAorTU9DSyBidWcgY29tbWVudDogYnVn X2lkPTUwMDAwLCBjYz1Ob25lLCBzZWVfYWxzbz1Ob25lCistLS0gQmVnaW4gY29tbWVudCAtLS0K K0NvbW1pdHRlZCByNDk4MjQ6IDxodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNDk4 MjQ+CistLS0gRW5kIGNvbW1lbnQgLS0tCisKKyIiIgorICAgICAgICBvcHRpb25zID0gc2VsZi5f ZGVmYXVsdF9vcHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5jbG9zZV9idWcgPSBGYWxzZQorICAg ICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoTGFuZCgpLCBbNTAwMDBdLCBvcHRpb25z PW9wdGlvbnMsIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKKworICAgIGRlZiB0ZXN0X2xh bmRfbm9fY29tbWVudF9ub19jbG9zZShzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICIi IkJ1aWxkaW5nIFdlYktpdAorUnVubmluZyBQeXRob24gdW5pdCB0ZXN0cworUnVubmluZyBQZXJs IHVuaXQgdGVzdHMKK1J1bm5pbmcgSmF2YVNjcmlwdENvcmUgdGVzdHMKK1J1bm5pbmcgcnVuLXdl YmtpdC10ZXN0cworQ29tbWl0dGVkIHI0OTgyNDogPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC80OTgyND4KK05vdCB1cGRhdGluZyBidWcgNTAwMDAKKyIiIgorICAgICAgICBvcHRp b25zID0gc2VsZi5fZGVmYXVsdF9vcHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5jb21tZW50X2J1 ZyA9IEZhbHNlCisgICAgICAgIG9wdGlvbnMuY2xvc2VfYnVnID0gRmFsc2UKKyAgICAgICAgc2Vs Zi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKExhbmQoKSwgWzUwMDAwXSwgb3B0aW9ucz1vcHRpb25z LCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpCisKICAgICBkZWYgdGVzdF9wcmVwYXJlX3Jl dmVydChzZWxmKToKICAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICJQcmVwYXJpbmcgcmV2ZXJ0IGZv ciBidWcgNTAwMDAuXG5VcGRhdGluZyB3b3JraW5nIGRpcmVjdG9yeVxuIgogICAgICAgICBzZWxm LmFzc2VydF9leGVjdXRlX291dHB1dHMoUHJlcGFyZVJldmVydCgpLCBbODUyLCAiUmVhc29uIl0s IG9wdGlvbnM9c2VsZi5fZGVmYXVsdF9vcHRpb25zKCksIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRf bG9ncykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jbG9z ZWJ1Z2ZvcmxhbmRkaWZmLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Ns b3NlYnVnZm9ybGFuZGRpZmYucHkKaW5kZXggZGE4ZTdjNDU3NWFmNTkzYThmNTM3ZGM3Y2ViMzEz N2I0NWE1NzhlYi4uM2U3OWY3MmQ2YmVhMTlkZWNjMTdhYTFlMDFjYTA0ZWUwMzc4NzU3NCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Nsb3NlYnVnZm9ybGFu ZGRpZmYucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Nsb3NlYnVn Zm9ybGFuZGRpZmYucHkKQEAgLTQwLDYgKzQwLDcgQEAgY2xhc3MgQ2xvc2VCdWdGb3JMYW5kRGlm ZihBYnN0cmFjdFN0ZXApOgogICAgIGRlZiBvcHRpb25zKGNscyk6CiAgICAgICAgIHJldHVybiBB YnN0cmFjdFN0ZXAub3B0aW9ucygpICsgWwogICAgICAgICAgICAgT3B0aW9ucy5jbG9zZV9idWcs CisgICAgICAgICAgICBPcHRpb25zLmNvbW1lbnRfYnVnLAogICAgICAgICBdCiAKICAgICBkZWYg cnVuKHNlbGYsIHN0YXRlKToKQEAgLTQ5LDEzICs1MCwxNSBAQCBjbGFzcyBDbG9zZUJ1Z0Zvckxh bmREaWZmKEFic3RyYWN0U3RlcCk6CiAgICAgICAgICAgICBidWdfaWQgPSBzdGF0ZS5nZXQoInBh dGNoIikuYnVnX2lkKCkKIAogICAgICAgICBpZiBidWdfaWQ6Ci0gICAgICAgICAgICBfbG9nLmlu Zm8oIlVwZGF0aW5nIGJ1ZyAlcyIgJSBidWdfaWQpCi0gICAgICAgICAgICBpZiBzZWxmLl9vcHRp b25zLmNsb3NlX2J1ZzoKLSAgICAgICAgICAgICAgICBzZWxmLl90b29sLmJ1Z3MuY2xvc2VfYnVn X2FzX2ZpeGVkKGJ1Z19pZCwgY29tbWVudF90ZXh0KQorICAgICAgICAgICAgaWYgc2VsZi5fb3B0 aW9ucy5jb21tZW50X2J1ZzoKKyAgICAgICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmNsb3Nl X2J1ZzoKKyAgICAgICAgICAgICAgICAgICAgX2xvZy5pbmZvKCJBZGRpbmcgY29tbWVudCBhbmQg Y2xvc2luZyBidWcgJXMiICUgYnVnX2lkKQorICAgICAgICAgICAgICAgICAgICBzZWxmLl90b29s LmJ1Z3MuY2xvc2VfYnVnX2FzX2ZpeGVkKGJ1Z19pZCwgY29tbWVudF90ZXh0KQorICAgICAgICAg ICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiQ29tbWVudGluZyB3 aXRob3V0IGNsb3NpbmcgYnVnICVzIiAlIGJ1Z19pZCkKKyAgICAgICAgICAgICAgICAgICAgc2Vs Zi5fdG9vbC5idWdzLnBvc3RfY29tbWVudF90b19idWcoYnVnX2lkLCBjb21tZW50X3RleHQpCiAg ICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBhIHNt YXJ0IHdheSB0byBmaWd1cmUgb3V0IGlmIHRoZSBwYXRjaCBpcyBhdHRhY2hlZAotICAgICAgICAg ICAgICAgICMgdG8gdGhlIGJ1ZywgYW5kIGlmIHNvIG9ic29sZXRlIGl0LgotICAgICAgICAgICAg ICAgIHNlbGYuX3Rvb2wuYnVncy5wb3N0X2NvbW1lbnRfdG9fYnVnKGJ1Z19pZCwgY29tbWVudF90 ZXh0KQorICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiTm90IHVwZGF0aW5nIGJ1ZyAlcyIgJSBi dWdfaWQpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBfbG9nLmluZm8oY29tbWVudF90ZXh0 KQogICAgICAgICAgICAgX2xvZy5pbmZvKCJObyBidWcgaWQgcHJvdmlkZWQuIikKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHkKaW5kZXggNDUyMmExYjkyYmU0 Yzg1ZTBlMzgzZGE4NTFmMzQxY2EyOWY2ZjBkZS4uNGNhMWVjOTZlNTQ5YmNjNjNjNTEyMGUyNGY1 ZmQzOWY4NmI2ZmZjOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0 ZXBzL29wdGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29w dGlvbnMucHkKQEAgLTQxLDYgKzQxLDcgQEAgY2xhc3MgT3B0aW9ucyhvYmplY3QpOgogICAgIGNo ZWNrX3N0eWxlX2ZpbHRlciA9IG1ha2Vfb3B0aW9uKCItLWNoZWNrLXN0eWxlLWZpbHRlciIsIGFj dGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJjaGVja19zdHlsZV9maWx0ZXIiLCBk ZWZhdWx0PU5vbmUsIGhlbHA9IkZpbHRlciBzdHlsZS1jaGVja2VyIHJ1bGVzIChzZWUgY2hlY2st d2Via2l0LXN0eWxlIC0taGVscCkuIikKICAgICBjbGVhbiA9IG1ha2Vfb3B0aW9uKCItLW5vLWNs ZWFuIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNsZWFuIiwgZGVmYXVsdD1UcnVlLCBo ZWxwPSJEb24ndCBjaGVjayBpZiB0aGUgd29ya2luZyBkaXJlY3RvcnkgaXMgY2xlYW4gYmVmb3Jl IGFwcGx5aW5nIHBhdGNoZXMiKQogICAgIGNsb3NlX2J1ZyA9IG1ha2Vfb3B0aW9uKCItLW5vLWNs b3NlIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNsb3NlX2J1ZyIsIGRlZmF1bHQ9VHJ1 ZSwgaGVscD0iTGVhdmUgYnVnIG9wZW4gYWZ0ZXIgbGFuZGluZy4iKQorICAgIGNvbW1lbnRfYnVn ID0gbWFrZV9vcHRpb24oIi0tbm8tY29tbWVudCIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0 PSJjb21tZW50X2J1ZyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG9uJ3QgYWRkIGEgY29tbWVudCBv biB0aGUgYnVnIGFmdGVyIGxhbmRpbmcuIikKICAgICBjb21tZW50ID0gbWFrZV9vcHRpb24oIi0t Y29tbWVudCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJjb21tZW50Iiwg aGVscD0iQ29tbWVudCB0byBwb3N0IHRvIGJ1Zy4iKQogICAgIGNvbXBvbmVudCA9IG1ha2Vfb3B0 aW9uKCItLWNvbXBvbmVudCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJj b21wb25lbnQiLCBoZWxwPSJDb21wb25lbnQgZm9yIHRoZSBuZXcgYnVnLiIpCiAgICAgY29uZmly bSA9IG1ha2Vfb3B0aW9uKCItLW5vLWNvbmZpcm0iLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVz dD0iY29uZmlybSIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iU2tpcCBjb25maXJtYXRpb24gc3RlcHMu IikK