225150 2021-04-28 06:50:31 -0700 webkitpy tests fail when HEAD is a merge commit or git author email is not an email 2021-05-05 06:51:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW InRadar P3 Normal --- 1 gsnedders webkit-unassigned jbedard webkit-bug-importer oldest_to_newest 1755005 0 gsnedders 2021-04-28 06:50:31 -0700 The merge case is more annoying than the latter, but my initial start at trying to fix this in webkitscmpy ran into its extensive mocking of git and I didn't have the energy to figure it out. Throwing the patch up here so it's at least somewhere that isn't my local drive. (Sidenote: would be good for the mock to throw or otherwise error if it gets arguments it isn't expecting.) 1755008 1 427258 gsnedders 2021-04-28 06:59:16 -0700 Created attachment 427258 Patch 1755010 2 427260 gsnedders 2021-04-28 07:00:13 -0700 Created attachment 427260 Patch 1755203 3 jbedard 2021-04-28 15:58:41 -0700 This is a fun one that I've encountered too, and we should fix it. I originally implemented this with deliberately strict regexes, and breaking not supporting merge-commits was also a deliberate choice, but maybe not the correct choice given the way folks do local development. 1756925 4 webkit-bug-importer 2021-05-05 06:51:16 -0700 <rdar://problem/77555267> 427258 2021-04-28 06:59:16 -0700 2021-04-28 07:00:10 -0700 Patch bug-225150-20210428145915.patch text/plain 16586 gsnedders U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NzA0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzkzNmVlZWI4NmE3NzQ1YjNjZmQ1NGJiYWFjZDFkYTUx ODkyZDNiMy4uMmY1YWRiZmQ1ZGViN2MzYTU1NWQyYzAwMTk1OTdiZjI5MjM3M2YzZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDIxLTA0LTI4ICBTYW0gU25lZGRvbiAgPGdzbmVkZGVyc0BhcHBsZS5jb20+CisKKyAg ICAgICAgd2Via2l0cHkgdGVzdHMgZmFpbCB3aGVuIEhFQUQgaXMgYSBtZXJnZSBjb21taXQgb3Ig Z2l0IGF1dGhvciBlbWFpbCBpcyBub3QgYW4gZW1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTE1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvY29udHJpYnV0b3IucHk6CisgICAgICAgIChDb250cmlidXRvcik6CisgICAg ICAgIChDb250cmlidXRvci5mcm9tX3NjbV9sb2cpOgorICAgICAgICAoQ29udHJpYnV0b3Iubm9y bWFsaXplX2F1dGhvcik6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0KToKKyAgICAgICAgKEdpdC5j b21taXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYnJvd3NlcnBlcmZkYXNoL2Jyb3dz ZXJwZXJmZGFzaF91bml0dGVzdC5weToKKyAgICAgICAgKEZha2VCcm93c2VyRHJpdmVyKToKKyAg ICAgICAgKEZha2VCcm93c2VyRHJpdmVyLl9faW5pdF9fKToKKyAgICAgICAgKEZha2VCcm93c2Vy RHJpdmVyLnByZXBhcmVfZW52KToKKyAgICAgICAgKEZha2VCcm93c2VyRHJpdmVyLnByZXBhcmVf aW5pdGlhbF9lbnYpOgorICAgICAgICAoRmFrZUJyb3dzZXJEcml2ZXIucmVzdG9yZV9lbnYpOgor ICAgICAgICAoRmFrZUJyb3dzZXJEcml2ZXIucmVzdG9yZV9lbnZfYWZ0ZXJfYWxsX3Rlc3Rpbmcp OgorICAgICAgICAoRmFrZUJyb3dzZXJEcml2ZXIuY2xvc2VfYnJvd3NlcnMpOgorICAgICAgICAo RmFrZUJyb3dzZXJEcml2ZXIubGF1bmNoX3VybCk6CisgICAgICAgIChGYWtlQnJvd3NlckRyaXZl ci5sYXVuY2hfd2ViZHJpdmVyKToKKyAgICAgICAgKEJyb3dzZXJQZXJmRGFzaFJ1bm5lclRlc3Qu dGVzdF9jYW5fY29uc3RydWN0X3J1bm5lcl9vYmplY3RfbWluaW11bV9wYXJhbWV0ZXJzKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0 LnB5OgorICAgICAgICAoR2l0VGVzdC5zZXRVcCk6CisgICAgICAgIChHaXRTVk5UZXN0Ll9zZXR1 cF9naXRfY2hlY2tvdXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3ByZXR0 eXBhdGNoX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUHJldHR5UGF0Y2hUZXN0LmNoZWNrX3J1Ynkp OgorICAgICAgICAodGVzdF9wcmV0dHlfZGlmZl9lbmNvZGluZ3MpOgorICAgICAgICAodGVzdF9w cmV0dHlfcHJpbnRfZW1wdHlfc3RyaW5nKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hj b2RlL3NpbXVsYXRlZF9kZXZpY2UucHk6CisgICAgICAgIChTaW11bGF0ZWREZXZpY2VNYW5hZ2Vy Ll9jcmVhdGVfZGV2aWNlX3dpdGhfcnVudGltZSk6CisgICAgICAgIChTaW11bGF0ZWREZXZpY2Uu c3RhdGUpOgorCiAyMDIxLTA0LTI3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KIAogICAgICAgICBEZWxldGUgdW51c2VkIGlFeHBsb2RlcgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmli dXRvci5weQppbmRleCA3NTU3MmE2ODFiNzJjMjUxNWRlZDA5MjdjNjJkNzI4ZTBhMTA4OTk1Li44 ZDRhYTkxNmY0M2NlYzdjMzdjNTNkMDliZjNjZmYxNjBhYzQxMzE5IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9j b250cmlidXRvci5weQpAQCAtMjgsMTAgKzI4LDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0 IHN0cmluZ191dGlscwogCiAKIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6Ci0gICAgR0lUX0FV VEhPUl9SRSA9IHJlLmNvbXBpbGUocidBdXRob3I6ICg/UDxhdXRob3I+LiopIDwoP1A8ZW1haWw+ W15AXStAW15AXSspKEAuKik/PicpCi0gICAgQVVUT01BVEVEX0NIRUNLSU5fUkUgPSByZS5jb21w aWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8ZGV2bnVsbD4nKQotICAgIFVOS05PV05fQVVU SE9SID0gcmUuY29tcGlsZShyJ0F1dGhvcjogKD9QPGF1dGhvcj4uKikgPE5vbmU+JykKLSAgICBF TVBUWV9BVVRIT1IgPSByZS5jb21waWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8PicpCisg ICAgR0lUX0FVVEhPUl9SRSA9IHJlLmNvbXBpbGUocidBdXRob3I6ICg/UDxhdXRob3I+LiopIDwo P1A8ZW1haWw+W14+XSopPz4nKQogICAgIFNWTl9BVVRIT1JfUkUgPSByZS5jb21waWxlKHInclxk KyBcfCAoP1A8ZW1haWw+LiopIFx8ICg/UDxkYXRlPi4qKSBcfCBcZCsgbGluZXM/JykKICAgICBT Vk5fUEFUQ0hfRlJPTV9SRSA9IHJlLmNvbXBpbGUocidQYXRjaCBieSAoP1A8YXV0aG9yPi4qKSA8 KD9QPGVtYWlsPi4qKT4gb24gXGQrLVxkKy1cZCsnKQogCkBAIC0xMTUsMTggKzExMiwxNiBAQCBj bGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICBlbWFpbCA9IE5vbmUKICAgICAgICAg YXV0aG9yID0gTm9uZQogCi0gICAgICAgIGZvciBleHByZXNzaW9uIGluIFtjbHMuR0lUX0FVVEhP Ul9SRSwgY2xzLlNWTl9BVVRIT1JfUkUsIGNscy5TVk5fUEFUQ0hfRlJPTV9SRSwgY2xzLkFVVE9N QVRFRF9DSEVDS0lOX1JFLCBjbHMuVU5LTk9XTl9BVVRIT1IsIGNscy5FTVBUWV9BVVRIT1JdOgor ICAgICAgICBmb3IgZXhwcmVzc2lvbiBpbiBbY2xzLkdJVF9BVVRIT1JfUkUsIGNscy5TVk5fQVVU SE9SX1JFLCBjbHMuU1ZOX1BBVENIX0ZST01fUkVdOgogICAgICAgICAgICAgbWF0Y2ggPSBleHBy ZXNzaW9uLm1hdGNoKGxpbmUpCiAgICAgICAgICAgICBpZiBtYXRjaDoKICAgICAgICAgICAgICAg ICBpZiAnYXV0aG9yJyBpbiBleHByZXNzaW9uLmdyb3VwaW5kZXg6CiAgICAgICAgICAgICAgICAg ICAgIGF1dGhvciA9IG1hdGNoLmdyb3VwKCdhdXRob3InKQotICAgICAgICAgICAgICAgICAgICBp ZiAnKG5vIGF1dGhvciknIGluIGF1dGhvciBvciAnQXV0b21hdGVkIENoZWNraW4nIGluIGF1dGhv ciBvciAnVW5rbm93bicgaW4gYXV0aG9yOgotICAgICAgICAgICAgICAgICAgICAgICAgYXV0aG9y ID0gTm9uZQogICAgICAgICAgICAgICAgIGlmICdlbWFpbCcgaW4gZXhwcmVzc2lvbi5ncm91cGlu ZGV4OgogICAgICAgICAgICAgICAgICAgICBlbWFpbCA9IG1hdGNoLmdyb3VwKCdlbWFpbCcpCi0g ICAgICAgICAgICAgICAgICAgIGlmICcobm8gYXV0aG9yKScgaW4gZW1haWw6Ci0gICAgICAgICAg ICAgICAgICAgICAgICBlbWFpbCA9IE5vbmUKLSAgICAgICAgICAgICAgICBicmVhaworICAgICAg ICAgICAgICAgIGF1dGhvciwgZW1haWwgPSBjbHMubm9ybWFsaXplX2F1dGhvcihhdXRob3IsIGVt YWlsKQorICAgICAgICAgICAgICAgIGlmIGF1dGhvciBvciBlbWFpbDoKKyAgICAgICAgICAgICAg ICAgICAgYnJlYWsKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3Io Iid7fScgZG9lcyBub3QgbWF0Y2ggYSBrbm93biBTQ00gbG9nIi5mb3JtYXQobGluZSkpCiAKQEAg LTEzNyw2ICsxMzIsMjAgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICAgICAgICAg IHJldHVybiBjb250cmlidXRvcnMuY3JlYXRlKGF1dGhvciwgZW1haWwpCiAgICAgICAgIHJldHVy biBjbHMoYXV0aG9yIG9yIGVtYWlsLCBlbWFpbHM9W2VtYWlsXSkKIAorICAgIEBjbGFzc21ldGhv ZAorICAgIGRlZiBub3JtYWxpemVfYXV0aG9yKGNscywgbmFtZSwgZW1haWw9Tm9uZSk6CisgICAg ICAgIGlmICcobm8gYXV0aG9yKScgaW4gbmFtZSBvciAnQXV0b21hdGVkIENoZWNraW4nIGluIG5h bWUgb3IgJ1Vua25vd24nIGluIG5hbWU6CisgICAgICAgICAgICBhdXRob3IgPSBOb25lCisgICAg ICAgICAgICBlbWFpbCA9IE5vbmUKKworICAgICAgICBpZiBlbWFpbCBpcyBub3QgTm9uZToKKyAg ICAgICAgICAgIGlmIGVtYWlsIGluICgiZGV2bnVsbCIsICJOb25lIiwgIiIpIG9yICcobm8gYXV0 aG9yKScgaW4gZW1haWw6CisgICAgICAgICAgICAgICAgZW1haWwgPSBOb25lCisgICAgICAgICAg ICBlbGlmIGVtYWlsLmNvdW50KCJAIikgPiAxOgorICAgICAgICAgICAgICAgIGVtYWlsLCBfID0g ZW1haWwucnNwbGl0KCJAIiwgMSkKKworICAgICAgICByZXR1cm4gbmFtZSwgZW1haWwKKwogICAg IGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbHM9Tm9uZSk6CiAgICAgICAgIHNlbGYubmFt ZSA9IHN0cmluZ191dGlscy5kZWNvZGUobmFtZSkKICAgICAgICAgc2VsZi5lbWFpbHMgPSBsaXN0 KGZpbHRlcihzdHJpbmdfdXRpbHMuZGVjb2RlLCBlbWFpbHMgb3IgW10pKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0 LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvZ2l0LnB5CmluZGV4IGE3NWE5OTU4ZTZlY2QyMjQ4YmY1MzMyNmQxZDUxNjNlODc4Zjc4YWIu LmI2MWJiN2FhODI5MGJhNWQxZTUyODgyZWRlOTdiMzFkNmRjMjc5MTEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s b2NhbC9naXQucHkKQEAgLTMxLDggKzMxLDYgQEAgZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgQ29t bWl0LCBDb250cmlidXRvciwgbG9nCiAKIAogY2xhc3MgR2l0KFNjbSk6Ci0gICAgR0lUX0NPTU1J VCA9IHJlLmNvbXBpbGUocidjb21taXQgKD9QPGhhc2g+WzAtOWEtZl0rKScpCi0KICAgICBAY2xh c3NtZXRob2QKICAgICBAZGVjb3JhdG9ycy5NZW1vaXplKCkKICAgICBkZWYgZXhlY3V0YWJsZShj bHMpOgpAQCAtMTcxLDcgKzE2OSw3IEBAIGNsYXNzIEdpdChTY20pOgogCiAgICAgICAgIGRlZmF1 bHRfYnJhbmNoID0gc2VsZi5kZWZhdWx0X2JyYW5jaAogICAgICAgICBwYXJzZWRfYnJhbmNoX3Bv aW50ID0gTm9uZQotICAgICAgICBsb2dfZm9ybWF0ID0gWyctMSddIGlmIGluY2x1ZGVfbG9nIGVs c2UgWyctMScsICctLWZvcm1hdD1zaG9ydCddCisgICAgICAgIGxvZ19mb3JtYXQgPSBbJy0xJywg Jy0tcHJldHR5PWZvcm1hdDolSCV4MDAlYW4leDAwJWFlJXgwMCVjdCV4MDAlQiddIGlmIGluY2x1 ZGVfbG9nIGVsc2UgWyctMScsICctLXByZXR0eT1mb3JtYXQ6JUgleDAwJWFuJXgwMCVhZSV4MDAl Y3QleDAwJXMnXQogCiAgICAgICAgIGlmIGlkZW50aWZpZXIgaXMgbm90IE5vbmU6CiAgICAgICAg ICAgICBpZiByZXZpc2lvbjoKQEAgLTIzNCwxMCArMjMyLDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAg ICAgICAgICAgICBpZiBsb2cucmV0dXJuY29kZToKICAgICAgICAgICAgICAgICByYWlzZSBzZWxm LkV4Y2VwdGlvbigiRmFpbGVkIHRvIHJldHJpZXZlIGNvbW1pdCBpbmZvcm1hdGlvbiBmb3IgJ3t9 JyIuZm9ybWF0KGhhc2ggb3IgJ0hFQUQnKSkKIAotICAgICAgICBtYXRjaCA9IHNlbGYuR0lUX0NP TU1JVC5tYXRjaChsb2cuc3Rkb3V0LnNwbGl0bGluZXMoKVswXSkKLSAgICAgICAgaWYgbm90IG1h dGNoOgotICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ0ludmFsaWQgY29tbWl0IGhh c2ggaW4gZ2l0IGxvZycpCi0gICAgICAgIGhhc2ggPSBtYXRjaC5ncm91cCgnaGFzaCcpCisgICAg ICAgIGhhc2gsIGF1dGhvcl9uYW1lLCBhdXRob3JfZW1haWwsIGNvbW1pdF90aW1lLCBsb2djb250 ZW50ID0gbG9nLnN0ZG91dC5zcGxpdCgiXHgwMCIsIDQpCiAKICAgICAgICAgYnJhbmNoID0gc2Vs Zi5wcmlvcml0aXplX2JyYW5jaGVzKHNlbGYuX2JyYW5jaGVzX2ZvcihoYXNoKSkKIApAQCAtMjQ3 LDE3ICsyNDIsMTAgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgIGlmIGJyYW5jaF9wb2ludCBh bmQgcGFyc2VkX2JyYW5jaF9wb2ludCBhbmQgYnJhbmNoX3BvaW50ICE9IHBhcnNlZF9icmFuY2hf cG9pbnQ6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJQcm92aWRlZCAnYnJhbmNoX3Bv aW50JyBkb2VzIG5vdCBtYXRjaCBicmFuY2ggcG9pbnQgb2Ygc3BlY2lmaWVkIGJyYW5jaCIpCiAK LSAgICAgICAgbG9nY29udGVudCA9ICdcbicuam9pbihsaW5lWzQ6XSBmb3IgbGluZSBpbiBsb2cu c3Rkb3V0LnNwbGl0bGluZXMoKVs0Ol0pCiAgICAgICAgIG1hdGNoZXMgPSBzZWxmLkdJVF9TVk5f UkVWSVNJT04uZmluZGFsbChsb2djb250ZW50KQogICAgICAgICByZXZpc2lvbiA9IGludChtYXRj aGVzWy0xXS5zcGxpdCgnQCcpWzBdKSBpZiBtYXRjaGVzIGVsc2UgTm9uZQogCi0gICAgICAgIGNv bW1pdF90aW1lID0gcnVuKAotICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnc2hvdycs ICctcycsICctLWZvcm1hdD0lY3QnLCBoYXNoXSwKLSAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3Rf cGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JywKLSAgICAgICAgKQot ICAgICAgICBpZiBjb21taXRfdGltZS5yZXR1cm5jb2RlOgotICAgICAgICAgICAgcmFpc2Ugc2Vs Zi5FeGNlcHRpb24oJ0ZhaWxlZCB0byByZXRyaWV2ZSBjb21taXQgdGltZSBmb3Ige30nLmZvcm1h dChoYXNoKSkKLSAgICAgICAgdGltZXN0YW1wID0gaW50KGNvbW1pdF90aW1lLnN0ZG91dC5sc3Ry aXAoKSkKKyAgICAgICAgdGltZXN0YW1wID0gaW50KGNvbW1pdF90aW1lKQogCiAgICAgICAgIG9y ZGVyID0gMAogICAgICAgICB3aGlsZSBub3QgaWRlbnRpZmllciBvciBvcmRlciArIDEgPCBpZGVu dGlmaWVyICsgKGJyYW5jaF9wb2ludCBvciAwKToKQEAgLTI3MSw2ICsyNTksMTQgQEAgY2xhc3Mg R2l0KFNjbSk6CiAgICAgICAgICAgICAgICAgYnJlYWsKICAgICAgICAgICAgIG9yZGVyICs9IDEK IAorICAgICAgICBhdXRob3JfbmFtZSwgYXV0aG9yX2VtYWlsID0gQ29udHJpYnV0b3Iubm9ybWFs aXplX2F1dGhvcihhdXRob3JfbmFtZSwgYXV0aG9yX2VtYWlsKQorICAgICAgICBpZiBhdXRob3Jf bmFtZSBpcyBOb25lIGFuZCBhdXRob3JfZW1haWwgaXMgTm9uZToKKyAgICAgICAgICAgIGF1dGhv ciA9IE5vbmUKKyAgICAgICAgZWxpZiBzZWxmLmNvbnRyaWJ1dG9yczoKKyAgICAgICAgICAgIGF1 dGhvciA9IHNlbGYuY29udHJpYnV0b3JzLmNyZWF0ZShhdXRob3JfbmFtZSwgYXV0aG9yX2VtYWls KQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgYXV0aG9yID0gQ29udHJpYnV0b3IoYXV0aG9y X25hbWUgb3IgYXV0aG9yX2VtYWlsLCBlbWFpbHM9W2F1dGhvcl9lbWFpbF0pCisKICAgICAgICAg cmV0dXJuIENvbW1pdCgKICAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9c2VsZi5pZCwKICAgICAg ICAgICAgIGhhc2g9aGFzaCwKQEAgLTI4MCw3ICsyNzYsNyBAQCBjbGFzcyBHaXQoU2NtKToKICAg ICAgICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAgICAgICB0aW1lc3RhbXA9dGltZXN0YW1w LAogICAgICAgICAgICAgb3JkZXI9b3JkZXIsCi0gICAgICAgICAgICBhdXRob3I9Q29udHJpYnV0 b3IuZnJvbV9zY21fbG9nKGxvZy5zdGRvdXQuc3BsaXRsaW5lcygpWzFdLCBzZWxmLmNvbnRyaWJ1 dG9ycyksCisgICAgICAgICAgICBhdXRob3I9YXV0aG9yLAogICAgICAgICAgICAgbWVzc2FnZT1s b2djb250ZW50IGlmIGluY2x1ZGVfbG9nIGVsc2UgTm9uZSwKICAgICAgICAgKQogCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Jyb3dzZXJwZXJmZGFzaC9icm93c2VycGVyZmRh c2hfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Jyb3dzZXJwZXJmZGFzaC9i cm93c2VycGVyZmRhc2hfdW5pdHRlc3QucHkKaW5kZXggZDhjYmYwMDliODEyZDQ0MWI2NjE2YmZi ZmZkMDQxOTQ4OWRjYjk4Yy4uOTcxZWFlNDJlMzcwZjUyODgwYmQ4OTVjYTc0OTJjYzQ3YmNjODA2 ZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9icm93c2VycGVyZmRhc2gvYnJv d3NlcnBlcmZkYXNoX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYnJv d3NlcnBlcmZkYXNoL2Jyb3dzZXJwZXJmZGFzaF91bml0dGVzdC5weQpAQCAtMjcsMTYgKzI3LDUy IEBAIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgdW5pdHRlc3QKIGltcG9ydCBvcwogCi1mcm9tIHdl YmtpdHB5LmJlbmNobWFya19ydW5uZXIucnVuX2JlbmNobWFyayBpbXBvcnQgZGVmYXVsdF9icm93 c2VyLCBkZWZhdWx0X3BsYXRmb3JtLCBiZW5jaG1hcmtfcnVubmVyX3N1YmNsYXNzZXMKIGZyb20g d2Via2l0cHkuYmVuY2htYXJrX3J1bm5lci5iZW5jaG1hcmtfcnVubmVyIGltcG9ydCBCZW5jaG1h cmtSdW5uZXIKLWZyb20gd2Via2l0cHkuYmVuY2htYXJrX3J1bm5lci53ZWJzZXJ2ZXJfYmVuY2ht YXJrX3J1bm5lciBpbXBvcnQgV2ViU2VydmVyQmVuY2htYXJrUnVubmVyCi1mcm9tIHdlYmtpdHB5 LmJlbmNobWFya19ydW5uZXIud2ViZHJpdmVyX2JlbmNobWFya19ydW5uZXIgaW1wb3J0IFdlYkRy aXZlckJlbmNobWFya1J1bm5lcgotZnJvbSB3ZWJraXRweS5iZW5jaG1hcmtfcnVubmVyLmJyb3dz ZXJfZHJpdmVyLmJyb3dzZXJfZHJpdmVyX2ZhY3RvcnkgaW1wb3J0IEJyb3dzZXJEcml2ZXJGYWN0 b3J5Citmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIuYnJvd3Nlcl9kcml2ZXIuYnJvd3Nl cl9kcml2ZXIgaW1wb3J0IEJyb3dzZXJEcml2ZXIKK2Zyb20gd2Via2l0cHkuYmVuY2htYXJrX3J1 bm5lci5icm93c2VyX2RyaXZlci5icm93c2VyX2RyaXZlcl9mYWN0b3J5IGltcG9ydCAoCisgICAg QnJvd3NlckRyaXZlckZhY3RvcnksCispCitmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIu cnVuX2JlbmNobWFyayBpbXBvcnQgKAorICAgIGJlbmNobWFya19ydW5uZXJfc3ViY2xhc3NlcywK KykKIAogCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAorY2xhc3MgRmFr ZUJyb3dzZXJEcml2ZXIoQnJvd3NlckRyaXZlcik6CisgICAgYnJvd3Nlcl9uYW1lID0gTm9uZQor ICAgIHByb2Nlc3Nfc2VhcmNoX2xpc3QgPSBbXQorICAgIHBsYXRmb3JtID0gImZha2UiCisKKyAg ICBkZWYgX19pbml0X18oc2VsZik6CisgICAgICAgIHNlbGYucHJvY2Vzc19uYW1lID0gImZha2Uv cHJvY2VzcyIKKworICAgIGRlZiBwcmVwYXJlX2VudihzZWxmLCBjb25maWcpOgorICAgICAgICBw YXNzCisKKyAgICBkZWYgcHJlcGFyZV9pbml0aWFsX2VudihzZWxmLCBjb25maWcpOgorICAgICAg ICBwYXNzCisKKyAgICBkZWYgcmVzdG9yZV9lbnYoc2VsZik6CisgICAgICAgIHBhc3MKKworICAg IGRlZiByZXN0b3JlX2Vudl9hZnRlcl9hbGxfdGVzdGluZyhzZWxmKToKKyAgICAgICAgcGFzcwor CisgICAgZGVmIGNsb3NlX2Jyb3dzZXJzKHNlbGYpOgorICAgICAgICBwYXNzCisKKyAgICBkZWYg bGF1bmNoX3VybChzZWxmLCB1cmwsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCwgYnJvd3Nl cl9wYXRoKToKKyAgICAgICAgcGFzcworCisgICAgZGVmIGxhdW5jaF93ZWJkcml2ZXIoc2VsZiwg dXJsLCBkcml2ZXIpOgorICAgICAgICBwYXNzCisKKworQnJvd3NlckRyaXZlckZhY3RvcnkuYWRk X2Jyb3dzZXJfZHJpdmVyKCJmYWtlIiwgTm9uZSwgRmFrZUJyb3dzZXJEcml2ZXIpCisKKwogY2xh c3MgRmFrZUJlbmNobWFya1J1bm5lcihCZW5jaG1hcmtSdW5uZXIpOgogICAgIG5hbWUgPSAnZmFr ZScKIApAQCAtNjAsNSArOTYsNyBAQCBjbGFzcyBCcm93c2VyUGVyZkRhc2hSdW5uZXJUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgIyBUaGlzIHRlc3RzIHRoYXQgY29uc3RydWN0aW5n IHRoZSBiZW5jaG1hcmtfcnVubmVyIG9iamVjdCBzcGVjaWZ5aW5nIHRoZSBtaW5pbXVtIHJlcXVp cmVkIHBhcmFtYXRlcnMgaXMgb2suCiAgICAgICAgIHBsYW5fbGlzdCA9IEJlbmNobWFya1J1bm5l ci5hdmFpbGFibGVfcGxhbnMoKQogICAgICAgICBidWlsZF9kaXIgPSBvcy5wYXRoLmFic3BhdGgo b3MuY3VyZGlyKQotICAgICAgICBydW5uZXIgPSBGYWtlQmVuY2htYXJrUnVubmVyKHBsYW5fbGlz dFswXSwgRmFsc2UsIDEsIGJ1aWxkX2RpciwgIi90bXAvdGVzdE91dHB1dC50eHQiLCBkZWZhdWx0 X3BsYXRmb3JtKCksIGRlZmF1bHRfYnJvd3NlcigpLCBOb25lKQorICAgICAgICBydW5uZXIgPSBG YWtlQmVuY2htYXJrUnVubmVyKAorICAgICAgICAgICAgcGxhbl9saXN0WzBdLCBGYWxzZSwgMSwg YnVpbGRfZGlyLCAiL3RtcC90ZXN0T3V0cHV0LnR4dCIsICJmYWtlIiwgTm9uZSwgTm9uZQorICAg ICAgICApCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShydW5uZXIuZXhlY3V0ZSgpKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21f dW5pdHRlc3QucHkKaW5kZXggZDBhYmU1ZmUwYWJmZmJiMjkwZjE0Yzc2Yzg4MGJhODNmZTFlZjJl Yy4uZTBkNjk5YTVkZTI2NTdkNjE0ZWNkM2I5OGExZTM5ZmYxMTEzYjc0OCAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3Vu aXR0ZXN0LnB5CkBAIC0xMDIyLDYgKzEwMjIsOCBAQCBjbGFzcyBHaXRUZXN0KFNDTVRlc3QpOgog ICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdpbml0Jywgc2VsZi51bnRyYWNraW5nX2NoZWNr b3V0X3BhdGhdKQogCiAgICAgICAgIG9zLmNoZGlyKHNlbGYudW50cmFja2luZ19jaGVja291dF9w YXRoKQorICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdjb25maWcnLCAndXNlci5uYW1lJywg J3NjbV91bml0dGVzdCddKQorICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdjb25maWcnLCAn dXNlci5lbWFpbCcsICdzY21fdW5pdHRlc3RAZXhhbXBsZS5jb20nXSkKICAgICAgICAgd3JpdGVf aW50b19maWxlX2F0X3BhdGgoJ2Zvb19maWxlJywgJ2ZvbycpCiAgICAgICAgIHJ1bl9jb21tYW5k KFsnZ2l0JywgJ2FkZCcsICdmb29fZmlsZSddKQogICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRf cGF0aCgnLmdpdGlnbm9yZScsICcqLnB5YycpCkBAIC0xMDMyLDYgKzEwMzQsOCBAQCBjbGFzcyBH aXRUZXN0KFNDTVRlc3QpOgogICAgICAgICBzZWxmLnRyYWNraW5nX2dpdF9jaGVja291dF9wYXRo ID0gdGVtcGZpbGUubWtkdGVtcChzdWZmaXg9ImdpdF90ZXN0X2NoZWNrb3V0IikKICAgICAgICAg cnVuX2NvbW1hbmQoWydnaXQnLCAnY2xvbmUnLCAnLS1xdWlldCcsIHNlbGYudW50cmFja2luZ19j aGVja291dF9wYXRoLCBzZWxmLnRyYWNraW5nX2dpdF9jaGVja291dF9wYXRoXSkKICAgICAgICAg b3MuY2hkaXIoc2VsZi50cmFja2luZ19naXRfY2hlY2tvdXRfcGF0aCkKKyAgICAgICAgcnVuX2Nv bW1hbmQoWydnaXQnLCAnY29uZmlnJywgJ3VzZXIubmFtZScsICdzY21fdW5pdHRlc3QnXSkKKyAg ICAgICAgcnVuX2NvbW1hbmQoWydnaXQnLCAnY29uZmlnJywgJ3VzZXIuZW1haWwnLCAnc2NtX3Vu aXR0ZXN0QGV4YW1wbGUuY29tJ10pCiAgICAgICAgIHNlbGYudHJhY2tpbmdfc2NtID0gZGV0ZWN0 X3NjbV9zeXN0ZW0oc2VsZi50cmFja2luZ19naXRfY2hlY2tvdXRfcGF0aCkKIAogICAgIGRlZiB0 ZWFyRG93bihzZWxmKToKQEAgLTExNzQsNiArMTE3OCw4IEBAIGNsYXNzIEdpdFNWTlRlc3QoU0NN VGVzdCk6CiAgICAgICAgICMgLS1xdWlldCBkb2Vzbid0IG1ha2UgZ2l0IHN2biBzaWxlbnQsIHNv IHdlIHVzZSBydW5fc2lsZW50IHRvIHJlZGlyZWN0IG91dHB1dAogICAgICAgICBydW5fc2lsZW50 KFsnZ2l0JywgJ3N2bicsICdjbG9uZScsICctVCcsICd0cnVuaycsICctLXByZWZpeCcsICcnLCBz ZWxmLnN2bl9yZXBvX3VybCwgc2VsZi5naXRfY2hlY2tvdXRfcGF0aF0pCiAgICAgICAgIG9zLmNo ZGlyKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgpCisgICAgICAgIHJ1bl9jb21tYW5kKFsnZ2l0Jywg J2NvbmZpZycsICd1c2VyLm5hbWUnLCAnc2NtX3VuaXR0ZXN0J10pCisgICAgICAgIHJ1bl9jb21t YW5kKFsnZ2l0JywgJ2NvbmZpZycsICd1c2VyLmVtYWlsJywgJ3NjbV91bml0dGVzdEBleGFtcGxl LmNvbSddKQogICAgICAgICBydW5fc2lsZW50KFsnZ2l0JywgJ2JyYW5jaCcsICctbScsICd0cnVu ayddKQogCiAgICAgZGVmIF90ZWFyX2Rvd25fZ2l0X2NoZWNrb3V0KHNlbGYpOgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2hfdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaF91bml0dGVzdC5weQpp bmRleCBmNGY3MDhkYWE0ZjY1NzE5MDUwMjFiNGM4Y2Q4MTk2ZDliMjdhNWFlLi5lM2ZjNmYzMTE5 MWY2MTEwNzBlZjFjZDJlMGQ3N2U1YTQ3NjkwODI3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaF91bml0dGVzdC5weQpAQCAtMjksNiArMjks NyBAQAogaW1wb3J0IG9zLnBhdGgKIGltcG9ydCBzeXMKIGltcG9ydCB1bml0dGVzdAorZnJvbSBk aXN0dXRpbHMudmVyc2lvbiBpbXBvcnQgU3RyaWN0VmVyc2lvbgogCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKIGZyb20gd2Via2l0cHkuY29t bW9uLnByZXR0eXBhdGNoIGltcG9ydCBQcmV0dHlQYXRjaApAQCAtMzgsMTAgKzM5LDExIEBAIGNs YXNzIFByZXR0eVBhdGNoVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIGNoZWNrX3J1 Ynkoc2VsZik6CiAgICAgICAgIGV4ZWN1dGl2ZSA9IEV4ZWN1dGl2ZSgpCiAgICAgICAgIHRyeToK LSAgICAgICAgICAgIHJlc3VsdCA9IGV4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ3J1YnknLCAnLS12 ZXJzaW9uJ10pCisgICAgICAgICAgICByZXN1bHQgPSBleGVjdXRpdmUucnVuX2NvbW1hbmQoWydy dWJ5JywgJy1lJywgJ3ByaW50KFJVQllfVkVSU0lPTiknXSkKICAgICAgICAgZXhjZXB0IE9TRXJy b3IgYXMgZToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQotICAgICAgICByZXR1cm4gVHJ1ZQor ICAgICAgICAjIFByZXR0eVBhdGNoIHJlbGllcyBvbiBXRUJyaWNrLCB3aGljaCB3YXMgcmVtb3Zl ZCBmcm9tIHRoZSBSdWJ5IHN0ZGxpYiBpbiAzCisgICAgICAgIHJldHVybiBTdHJpY3RWZXJzaW9u KHJlc3VsdCkgPCBTdHJpY3RWZXJzaW9uKCIzLjAuMCIpCiAKICAgICBfZGlmZl93aXRoX211bHRp cGxlX2VuY29kaW5ncyA9ICIiIgogSW5kZXg6IHV0ZjhfdGVzdApAQCAtNjgsMTAgKzcwLDExIEBA IEluZGV4OiBsYXRpbjFfdGVzdAogCiAgICAgZGVmIHRlc3RfcHJldHR5X2RpZmZfZW5jb2Rpbmdz KHNlbGYpOgogICAgICAgICBpZiBub3Qgc2VsZi5jaGVja19ydWJ5KCk6CisgICAgICAgICAgICBz ZWxmLnNraXBUZXN0KCJuby91bnN1cHBvcnRlZCBSdWJ5IikKICAgICAgICAgICAgIHJldHVybgog CiAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4nKToKLSAgICAgICAgICAg ICMgRklYTUU6IGRpc2FibGVkIGR1ZSB0byBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTMxOTIKKyAgICAgICAgICAgIHNlbGYuc2tpcFRlc3QoIkZJWE1FOiBkaXNhYmxl ZCBkdWUgdG8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMTkyIikK ICAgICAgICAgICAgIHJldHVybgogCiAgICAgICAgIHByZXR0eV9wYXRjaCA9IFByZXR0eVBhdGNo KEV4ZWN1dGl2ZSgpLCBzZWxmLl93ZWJraXRfcm9vdCgpKQpAQCAtODEsNiArODQsNyBAQCBJbmRl eDogbGF0aW4xX3Rlc3QKIAogICAgIGRlZiB0ZXN0X3ByZXR0eV9wcmludF9lbXB0eV9zdHJpbmco c2VsZik6CiAgICAgICAgIGlmIG5vdCBzZWxmLmNoZWNrX3J1YnkoKToKKyAgICAgICAgICAgIHNl bGYuc2tpcFRlc3QoIm5vL3Vuc3VwcG9ydGVkIFJ1YnkiKQogICAgICAgICAgICAgcmV0dXJuCiAK ICAgICAgICAgIyBNYWtlIHN1cmUgdGhhdCBhbiBlbXB0eSBkaWZmIGRvZXMgbm90IGhhbmcgdGhl IHByb2Nlc3MuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVs YXRlZF9kZXZpY2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9k ZXZpY2UucHkKaW5kZXggNDgxZWNmM2UyN2Q0Y2U2ZjBmZjQ2YTRmOWYyOTJkMjI5MjQ4OWJlYi4u ZGMyNTExYjMzMzcyNzcyM2E0MThlYTRlMTVhYzNmYmMwMThiZGM1ZiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5weQpAQCAtMjMsNyArMjMs NiBAQAogaW1wb3J0IGF0ZXhpdAogaW1wb3J0IGpzb24KIGltcG9ydCBsb2dnaW5nCi1pbXBvcnQg cGxpc3RsaWIKIGltcG9ydCByZQogaW1wb3J0IHRpbWUKIApAQCAtMzUsNiArMzQsMTEgQEAgZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3QgaW1wb3J0IFN5c3RlbUhvc3QKIGZy b20gd2Via2l0cHkucG9ydC5kZXZpY2UgaW1wb3J0IERldmljZQogZnJvbSB3ZWJraXRweS54Y29k ZS5kZXZpY2VfdHlwZSBpbXBvcnQgRGV2aWNlVHlwZQogCit0cnk6CisgICAgZnJvbSBwbGlzdGxp YiBpbXBvcnQgbG9hZCBhcyByZWFkUGxpc3QKK2V4Y2VwdCBJbXBvcnRFcnJvcjoKKyAgICBmcm9t IHBsaXN0bGliIGltcG9ydCByZWFkUGxpc3QKKwogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9f bmFtZV9fKQogCiAKQEAgLTEwNiw3ICsxMTAsNyBAQCBjbGFzcyBTaW11bGF0ZWREZXZpY2VNYW5h Z2VyKG9iamVjdCk6CiAKICAgICAgICAgIyBGaW5kIGRldmljZSB0eXBlLiBJZiB3ZSBjYW4ndCBw YXJzZSB0aGUgZGV2aWNlIHR5cGUsIGlnbm9yZSB0aGlzIGRldmljZS4KICAgICAgICAgdHJ5Ogot ICAgICAgICAgICAgZGV2aWNlX3R5cGVfc3RyaW5nID0gU2ltdWxhdGVkRGV2aWNlTWFuYWdlci5f ZGV2aWNlX2lkZW50aWZpZXJfdG9fbmFtZVtwbGlzdGxpYi5yZWFkUGxpc3QoaG9zdC5maWxlc3lz dGVtLm9wZW5fYmluYXJ5X2ZpbGVfZm9yX3JlYWRpbmcoZGV2aWNlX3BsaXN0KSlbJ2RldmljZVR5 cGUnXV0KKyAgICAgICAgICAgIGRldmljZV90eXBlX3N0cmluZyA9IFNpbXVsYXRlZERldmljZU1h bmFnZXIuX2RldmljZV9pZGVudGlmaWVyX3RvX25hbWVbcmVhZFBsaXN0KGhvc3QuZmlsZXN5c3Rl bS5vcGVuX2JpbmFyeV9maWxlX2Zvcl9yZWFkaW5nKGRldmljZV9wbGlzdCkpWydkZXZpY2VUeXBl J11dCiAgICAgICAgICAgICBkZXZpY2VfdHlwZSA9IERldmljZVR5cGUuZnJvbV9zdHJpbmcoZGV2 aWNlX3R5cGVfc3RyaW5nLCBydW50aW1lLnZlcnNpb24pCiAgICAgICAgICAgICBhc3NlcnQgZGV2 aWNlX3R5cGUuc29mdHdhcmVfdmFyaWFudCA9PSBydW50aW1lLm9zX3ZhcmlhbnQKICAgICAgICAg ZXhjZXB0IChWYWx1ZUVycm9yLCBBc3NlcnRpb25FcnJvcik6CkBAIC01NDksNyArNTUzLDcgQEAg Y2xhc3MgU2ltdWxhdGVkRGV2aWNlKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5f c3RhdGUKIAogICAgICAgICBkZXZpY2VfcGxpc3QgPSBzZWxmLmZpbGVzeXN0ZW0uZXhwYW5kdXNl cihzZWxmLmZpbGVzeXN0ZW0uam9pbihTaW11bGF0ZWREZXZpY2VNYW5hZ2VyLnNpbXVsYXRvcl9k ZXZpY2VfcGF0aCwgc2VsZi51ZGlkLCAnZGV2aWNlLnBsaXN0JykpCi0gICAgICAgIHNlbGYuX3N0 YXRlID0gaW50KHBsaXN0bGliLnJlYWRQbGlzdChzZWxmLmZpbGVzeXN0ZW0ub3Blbl9iaW5hcnlf ZmlsZV9mb3JfcmVhZGluZyhkZXZpY2VfcGxpc3QpKVsnc3RhdGUnXSkKKyAgICAgICAgc2VsZi5f c3RhdGUgPSBpbnQocmVhZFBsaXN0KHNlbGYuZmlsZXN5c3RlbS5vcGVuX2JpbmFyeV9maWxlX2Zv cl9yZWFkaW5nKGRldmljZV9wbGlzdCkpWydzdGF0ZSddKQogICAgICAgICBzZWxmLl9sYXN0X3Vw ZGF0ZWRfc3RhdGUgPSB0aW1lLnRpbWUoKQogICAgICAgICByZXR1cm4gc2VsZi5fc3RhdGUKIAo= 427260 2021-04-28 07:00:13 -0700 2021-04-28 07:00:13 -0700 Patch bug-225150-20210428150012.patch text/plain 8143 gsnedders U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NzA0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzkzNmVlZWI4NmE3NzQ1YjNjZmQ1NGJiYWFjZDFkYTUx ODkyZDNiMy4uMmY1YWRiZmQ1ZGViN2MzYTU1NWQyYzAwMTk1OTdiZjI5MjM3M2YzZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDIxLTA0LTI4ICBTYW0gU25lZGRvbiAgPGdzbmVkZGVyc0BhcHBsZS5jb20+CisKKyAg ICAgICAgd2Via2l0cHkgdGVzdHMgZmFpbCB3aGVuIEhFQUQgaXMgYSBtZXJnZSBjb21taXQgb3Ig Z2l0IGF1dGhvciBlbWFpbCBpcyBub3QgYW4gZW1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTE1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvY29udHJpYnV0b3IucHk6CisgICAgICAgIChDb250cmlidXRvcik6CisgICAg ICAgIChDb250cmlidXRvci5mcm9tX3NjbV9sb2cpOgorICAgICAgICAoQ29udHJpYnV0b3Iubm9y bWFsaXplX2F1dGhvcik6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0KToKKyAgICAgICAgKEdpdC5j b21taXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYnJvd3NlcnBlcmZkYXNoL2Jyb3dz ZXJwZXJmZGFzaF91bml0dGVzdC5weToKKyAgICAgICAgKEZha2VCcm93c2VyRHJpdmVyKToKKyAg ICAgICAgKEZha2VCcm93c2VyRHJpdmVyLl9faW5pdF9fKToKKyAgICAgICAgKEZha2VCcm93c2Vy RHJpdmVyLnByZXBhcmVfZW52KToKKyAgICAgICAgKEZha2VCcm93c2VyRHJpdmVyLnByZXBhcmVf aW5pdGlhbF9lbnYpOgorICAgICAgICAoRmFrZUJyb3dzZXJEcml2ZXIucmVzdG9yZV9lbnYpOgor ICAgICAgICAoRmFrZUJyb3dzZXJEcml2ZXIucmVzdG9yZV9lbnZfYWZ0ZXJfYWxsX3Rlc3Rpbmcp OgorICAgICAgICAoRmFrZUJyb3dzZXJEcml2ZXIuY2xvc2VfYnJvd3NlcnMpOgorICAgICAgICAo RmFrZUJyb3dzZXJEcml2ZXIubGF1bmNoX3VybCk6CisgICAgICAgIChGYWtlQnJvd3NlckRyaXZl ci5sYXVuY2hfd2ViZHJpdmVyKToKKyAgICAgICAgKEJyb3dzZXJQZXJmRGFzaFJ1bm5lclRlc3Qu dGVzdF9jYW5fY29uc3RydWN0X3J1bm5lcl9vYmplY3RfbWluaW11bV9wYXJhbWV0ZXJzKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0 LnB5OgorICAgICAgICAoR2l0VGVzdC5zZXRVcCk6CisgICAgICAgIChHaXRTVk5UZXN0Ll9zZXR1 cF9naXRfY2hlY2tvdXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3ByZXR0 eXBhdGNoX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUHJldHR5UGF0Y2hUZXN0LmNoZWNrX3J1Ynkp OgorICAgICAgICAodGVzdF9wcmV0dHlfZGlmZl9lbmNvZGluZ3MpOgorICAgICAgICAodGVzdF9w cmV0dHlfcHJpbnRfZW1wdHlfc3RyaW5nKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hj b2RlL3NpbXVsYXRlZF9kZXZpY2UucHk6CisgICAgICAgIChTaW11bGF0ZWREZXZpY2VNYW5hZ2Vy Ll9jcmVhdGVfZGV2aWNlX3dpdGhfcnVudGltZSk6CisgICAgICAgIChTaW11bGF0ZWREZXZpY2Uu c3RhdGUpOgorCiAyMDIxLTA0LTI3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KIAogICAgICAgICBEZWxldGUgdW51c2VkIGlFeHBsb2RlcgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmli dXRvci5weQppbmRleCA3NTU3MmE2ODFiNzJjMjUxNWRlZDA5MjdjNjJkNzI4ZTBhMTA4OTk1Li44 ZDRhYTkxNmY0M2NlYzdjMzdjNTNkMDliZjNjZmYxNjBhYzQxMzE5IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9j b250cmlidXRvci5weQpAQCAtMjgsMTAgKzI4LDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0 IHN0cmluZ191dGlscwogCiAKIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6Ci0gICAgR0lUX0FV VEhPUl9SRSA9IHJlLmNvbXBpbGUocidBdXRob3I6ICg/UDxhdXRob3I+LiopIDwoP1A8ZW1haWw+ W15AXStAW15AXSspKEAuKik/PicpCi0gICAgQVVUT01BVEVEX0NIRUNLSU5fUkUgPSByZS5jb21w aWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8ZGV2bnVsbD4nKQotICAgIFVOS05PV05fQVVU SE9SID0gcmUuY29tcGlsZShyJ0F1dGhvcjogKD9QPGF1dGhvcj4uKikgPE5vbmU+JykKLSAgICBF TVBUWV9BVVRIT1IgPSByZS5jb21waWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8PicpCisg ICAgR0lUX0FVVEhPUl9SRSA9IHJlLmNvbXBpbGUocidBdXRob3I6ICg/UDxhdXRob3I+LiopIDwo P1A8ZW1haWw+W14+XSopPz4nKQogICAgIFNWTl9BVVRIT1JfUkUgPSByZS5jb21waWxlKHInclxk KyBcfCAoP1A8ZW1haWw+LiopIFx8ICg/UDxkYXRlPi4qKSBcfCBcZCsgbGluZXM/JykKICAgICBT Vk5fUEFUQ0hfRlJPTV9SRSA9IHJlLmNvbXBpbGUocidQYXRjaCBieSAoP1A8YXV0aG9yPi4qKSA8 KD9QPGVtYWlsPi4qKT4gb24gXGQrLVxkKy1cZCsnKQogCkBAIC0xMTUsMTggKzExMiwxNiBAQCBj bGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICBlbWFpbCA9IE5vbmUKICAgICAgICAg YXV0aG9yID0gTm9uZQogCi0gICAgICAgIGZvciBleHByZXNzaW9uIGluIFtjbHMuR0lUX0FVVEhP Ul9SRSwgY2xzLlNWTl9BVVRIT1JfUkUsIGNscy5TVk5fUEFUQ0hfRlJPTV9SRSwgY2xzLkFVVE9N QVRFRF9DSEVDS0lOX1JFLCBjbHMuVU5LTk9XTl9BVVRIT1IsIGNscy5FTVBUWV9BVVRIT1JdOgor ICAgICAgICBmb3IgZXhwcmVzc2lvbiBpbiBbY2xzLkdJVF9BVVRIT1JfUkUsIGNscy5TVk5fQVVU SE9SX1JFLCBjbHMuU1ZOX1BBVENIX0ZST01fUkVdOgogICAgICAgICAgICAgbWF0Y2ggPSBleHBy ZXNzaW9uLm1hdGNoKGxpbmUpCiAgICAgICAgICAgICBpZiBtYXRjaDoKICAgICAgICAgICAgICAg ICBpZiAnYXV0aG9yJyBpbiBleHByZXNzaW9uLmdyb3VwaW5kZXg6CiAgICAgICAgICAgICAgICAg ICAgIGF1dGhvciA9IG1hdGNoLmdyb3VwKCdhdXRob3InKQotICAgICAgICAgICAgICAgICAgICBp ZiAnKG5vIGF1dGhvciknIGluIGF1dGhvciBvciAnQXV0b21hdGVkIENoZWNraW4nIGluIGF1dGhv ciBvciAnVW5rbm93bicgaW4gYXV0aG9yOgotICAgICAgICAgICAgICAgICAgICAgICAgYXV0aG9y ID0gTm9uZQogICAgICAgICAgICAgICAgIGlmICdlbWFpbCcgaW4gZXhwcmVzc2lvbi5ncm91cGlu ZGV4OgogICAgICAgICAgICAgICAgICAgICBlbWFpbCA9IG1hdGNoLmdyb3VwKCdlbWFpbCcpCi0g ICAgICAgICAgICAgICAgICAgIGlmICcobm8gYXV0aG9yKScgaW4gZW1haWw6Ci0gICAgICAgICAg ICAgICAgICAgICAgICBlbWFpbCA9IE5vbmUKLSAgICAgICAgICAgICAgICBicmVhaworICAgICAg ICAgICAgICAgIGF1dGhvciwgZW1haWwgPSBjbHMubm9ybWFsaXplX2F1dGhvcihhdXRob3IsIGVt YWlsKQorICAgICAgICAgICAgICAgIGlmIGF1dGhvciBvciBlbWFpbDoKKyAgICAgICAgICAgICAg ICAgICAgYnJlYWsKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3Io Iid7fScgZG9lcyBub3QgbWF0Y2ggYSBrbm93biBTQ00gbG9nIi5mb3JtYXQobGluZSkpCiAKQEAg LTEzNyw2ICsxMzIsMjAgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICAgICAgICAg IHJldHVybiBjb250cmlidXRvcnMuY3JlYXRlKGF1dGhvciwgZW1haWwpCiAgICAgICAgIHJldHVy biBjbHMoYXV0aG9yIG9yIGVtYWlsLCBlbWFpbHM9W2VtYWlsXSkKIAorICAgIEBjbGFzc21ldGhv ZAorICAgIGRlZiBub3JtYWxpemVfYXV0aG9yKGNscywgbmFtZSwgZW1haWw9Tm9uZSk6CisgICAg ICAgIGlmICcobm8gYXV0aG9yKScgaW4gbmFtZSBvciAnQXV0b21hdGVkIENoZWNraW4nIGluIG5h bWUgb3IgJ1Vua25vd24nIGluIG5hbWU6CisgICAgICAgICAgICBhdXRob3IgPSBOb25lCisgICAg ICAgICAgICBlbWFpbCA9IE5vbmUKKworICAgICAgICBpZiBlbWFpbCBpcyBub3QgTm9uZToKKyAg ICAgICAgICAgIGlmIGVtYWlsIGluICgiZGV2bnVsbCIsICJOb25lIiwgIiIpIG9yICcobm8gYXV0 aG9yKScgaW4gZW1haWw6CisgICAgICAgICAgICAgICAgZW1haWwgPSBOb25lCisgICAgICAgICAg ICBlbGlmIGVtYWlsLmNvdW50KCJAIikgPiAxOgorICAgICAgICAgICAgICAgIGVtYWlsLCBfID0g ZW1haWwucnNwbGl0KCJAIiwgMSkKKworICAgICAgICByZXR1cm4gbmFtZSwgZW1haWwKKwogICAg IGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbHM9Tm9uZSk6CiAgICAgICAgIHNlbGYubmFt ZSA9IHN0cmluZ191dGlscy5kZWNvZGUobmFtZSkKICAgICAgICAgc2VsZi5lbWFpbHMgPSBsaXN0 KGZpbHRlcihzdHJpbmdfdXRpbHMuZGVjb2RlLCBlbWFpbHMgb3IgW10pKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0 LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvZ2l0LnB5CmluZGV4IGE3NWE5OTU4ZTZlY2QyMjQ4YmY1MzMyNmQxZDUxNjNlODc4Zjc4YWIu LmI2MWJiN2FhODI5MGJhNWQxZTUyODgyZWRlOTdiMzFkNmRjMjc5MTEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s b2NhbC9naXQucHkKQEAgLTMxLDggKzMxLDYgQEAgZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgQ29t bWl0LCBDb250cmlidXRvciwgbG9nCiAKIAogY2xhc3MgR2l0KFNjbSk6Ci0gICAgR0lUX0NPTU1J VCA9IHJlLmNvbXBpbGUocidjb21taXQgKD9QPGhhc2g+WzAtOWEtZl0rKScpCi0KICAgICBAY2xh c3NtZXRob2QKICAgICBAZGVjb3JhdG9ycy5NZW1vaXplKCkKICAgICBkZWYgZXhlY3V0YWJsZShj bHMpOgpAQCAtMTcxLDcgKzE2OSw3IEBAIGNsYXNzIEdpdChTY20pOgogCiAgICAgICAgIGRlZmF1 bHRfYnJhbmNoID0gc2VsZi5kZWZhdWx0X2JyYW5jaAogICAgICAgICBwYXJzZWRfYnJhbmNoX3Bv aW50ID0gTm9uZQotICAgICAgICBsb2dfZm9ybWF0ID0gWyctMSddIGlmIGluY2x1ZGVfbG9nIGVs c2UgWyctMScsICctLWZvcm1hdD1zaG9ydCddCisgICAgICAgIGxvZ19mb3JtYXQgPSBbJy0xJywg Jy0tcHJldHR5PWZvcm1hdDolSCV4MDAlYW4leDAwJWFlJXgwMCVjdCV4MDAlQiddIGlmIGluY2x1 ZGVfbG9nIGVsc2UgWyctMScsICctLXByZXR0eT1mb3JtYXQ6JUgleDAwJWFuJXgwMCVhZSV4MDAl Y3QleDAwJXMnXQogCiAgICAgICAgIGlmIGlkZW50aWZpZXIgaXMgbm90IE5vbmU6CiAgICAgICAg ICAgICBpZiByZXZpc2lvbjoKQEAgLTIzNCwxMCArMjMyLDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAg ICAgICAgICAgICBpZiBsb2cucmV0dXJuY29kZToKICAgICAgICAgICAgICAgICByYWlzZSBzZWxm LkV4Y2VwdGlvbigiRmFpbGVkIHRvIHJldHJpZXZlIGNvbW1pdCBpbmZvcm1hdGlvbiBmb3IgJ3t9 JyIuZm9ybWF0KGhhc2ggb3IgJ0hFQUQnKSkKIAotICAgICAgICBtYXRjaCA9IHNlbGYuR0lUX0NP TU1JVC5tYXRjaChsb2cuc3Rkb3V0LnNwbGl0bGluZXMoKVswXSkKLSAgICAgICAgaWYgbm90IG1h dGNoOgotICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ0ludmFsaWQgY29tbWl0IGhh c2ggaW4gZ2l0IGxvZycpCi0gICAgICAgIGhhc2ggPSBtYXRjaC5ncm91cCgnaGFzaCcpCisgICAg ICAgIGhhc2gsIGF1dGhvcl9uYW1lLCBhdXRob3JfZW1haWwsIGNvbW1pdF90aW1lLCBsb2djb250 ZW50ID0gbG9nLnN0ZG91dC5zcGxpdCgiXHgwMCIsIDQpCiAKICAgICAgICAgYnJhbmNoID0gc2Vs Zi5wcmlvcml0aXplX2JyYW5jaGVzKHNlbGYuX2JyYW5jaGVzX2ZvcihoYXNoKSkKIApAQCAtMjQ3 LDE3ICsyNDIsMTAgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgIGlmIGJyYW5jaF9wb2ludCBh bmQgcGFyc2VkX2JyYW5jaF9wb2ludCBhbmQgYnJhbmNoX3BvaW50ICE9IHBhcnNlZF9icmFuY2hf cG9pbnQ6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJQcm92aWRlZCAnYnJhbmNoX3Bv aW50JyBkb2VzIG5vdCBtYXRjaCBicmFuY2ggcG9pbnQgb2Ygc3BlY2lmaWVkIGJyYW5jaCIpCiAK LSAgICAgICAgbG9nY29udGVudCA9ICdcbicuam9pbihsaW5lWzQ6XSBmb3IgbGluZSBpbiBsb2cu c3Rkb3V0LnNwbGl0bGluZXMoKVs0Ol0pCiAgICAgICAgIG1hdGNoZXMgPSBzZWxmLkdJVF9TVk5f UkVWSVNJT04uZmluZGFsbChsb2djb250ZW50KQogICAgICAgICByZXZpc2lvbiA9IGludChtYXRj aGVzWy0xXS5zcGxpdCgnQCcpWzBdKSBpZiBtYXRjaGVzIGVsc2UgTm9uZQogCi0gICAgICAgIGNv bW1pdF90aW1lID0gcnVuKAotICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnc2hvdycs ICctcycsICctLWZvcm1hdD0lY3QnLCBoYXNoXSwKLSAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3Rf cGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JywKLSAgICAgICAgKQot ICAgICAgICBpZiBjb21taXRfdGltZS5yZXR1cm5jb2RlOgotICAgICAgICAgICAgcmFpc2Ugc2Vs Zi5FeGNlcHRpb24oJ0ZhaWxlZCB0byByZXRyaWV2ZSBjb21taXQgdGltZSBmb3Ige30nLmZvcm1h dChoYXNoKSkKLSAgICAgICAgdGltZXN0YW1wID0gaW50KGNvbW1pdF90aW1lLnN0ZG91dC5sc3Ry aXAoKSkKKyAgICAgICAgdGltZXN0YW1wID0gaW50KGNvbW1pdF90aW1lKQogCiAgICAgICAgIG9y ZGVyID0gMAogICAgICAgICB3aGlsZSBub3QgaWRlbnRpZmllciBvciBvcmRlciArIDEgPCBpZGVu dGlmaWVyICsgKGJyYW5jaF9wb2ludCBvciAwKToKQEAgLTI3MSw2ICsyNTksMTQgQEAgY2xhc3Mg R2l0KFNjbSk6CiAgICAgICAgICAgICAgICAgYnJlYWsKICAgICAgICAgICAgIG9yZGVyICs9IDEK IAorICAgICAgICBhdXRob3JfbmFtZSwgYXV0aG9yX2VtYWlsID0gQ29udHJpYnV0b3Iubm9ybWFs aXplX2F1dGhvcihhdXRob3JfbmFtZSwgYXV0aG9yX2VtYWlsKQorICAgICAgICBpZiBhdXRob3Jf bmFtZSBpcyBOb25lIGFuZCBhdXRob3JfZW1haWwgaXMgTm9uZToKKyAgICAgICAgICAgIGF1dGhv ciA9IE5vbmUKKyAgICAgICAgZWxpZiBzZWxmLmNvbnRyaWJ1dG9yczoKKyAgICAgICAgICAgIGF1 dGhvciA9IHNlbGYuY29udHJpYnV0b3JzLmNyZWF0ZShhdXRob3JfbmFtZSwgYXV0aG9yX2VtYWls KQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgYXV0aG9yID0gQ29udHJpYnV0b3IoYXV0aG9y X25hbWUgb3IgYXV0aG9yX2VtYWlsLCBlbWFpbHM9W2F1dGhvcl9lbWFpbF0pCisKICAgICAgICAg cmV0dXJuIENvbW1pdCgKICAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9c2VsZi5pZCwKICAgICAg ICAgICAgIGhhc2g9aGFzaCwKQEAgLTI4MCw3ICsyNzYsNyBAQCBjbGFzcyBHaXQoU2NtKToKICAg ICAgICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAgICAgICB0aW1lc3RhbXA9dGltZXN0YW1w LAogICAgICAgICAgICAgb3JkZXI9b3JkZXIsCi0gICAgICAgICAgICBhdXRob3I9Q29udHJpYnV0 b3IuZnJvbV9zY21fbG9nKGxvZy5zdGRvdXQuc3BsaXRsaW5lcygpWzFdLCBzZWxmLmNvbnRyaWJ1 dG9ycyksCisgICAgICAgICAgICBhdXRob3I9YXV0aG9yLAogICAgICAgICAgICAgbWVzc2FnZT1s b2djb250ZW50IGlmIGluY2x1ZGVfbG9nIGVsc2UgTm9uZSwKICAgICAgICAgKQogCg==