219172 2020-11-19 11:31:50 -0800 [webkitscmpy] Support remote repositories in git-webkit 2020-11-30 11:23:32 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=218827 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu webkit-bug-importer oldest_to_newest 1709200 0 jbedard 2020-11-19 11:31:50 -0800 Now that remote Subversion repositories are supported, we should support running select git-webkit commands with a remote repository. 1709201 1 webkit-bug-importer 2020-11-19 11:32:01 -0800 <rdar://problem/71594909> 1709209 2 414608 jbedard 2020-11-19 11:44:48 -0800 Created attachment 414608 Patch 1710612 3 415022 jbedard 2020-11-30 07:50:14 -0800 Created attachment 415022 Patch 1710630 4 415022 aakash_jain 2020-11-30 08:42:30 -0800 Comment on attachment 415022 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415022&action=review rs=me > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program.py:185 > + if parsed.repository.startswith('https://') or parsed.repository.startswith('http://'): can use single startswith. From https://docs.python.org/3/library/stdtypes.html#str.startswith: "prefix can also be a tuple of prefixes to look for" 1710674 5 415033 jbedard 2020-11-30 10:52:20 -0800 Created attachment 415033 Patch 1710689 6 ews-feeder 2020-11-30 11:23:31 -0800 Committed r270254: <https://trac.webkit.org/changeset/270254> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415033. 414608 2020-11-19 11:44:48 -0800 2020-11-30 07:50:12 -0800 Patch bug-219172-20201119114447.patch text/plain 7242 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDAzOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIwLTExLTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgcmVtb3RlIHJlcG9zaXRvcmllcyBp biBnaXQtd2Via2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTkxNzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk0OTA5PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weToKKyAgICAgICAgKENvbW1hbmQu cGFyc2VyKTogUmVtb3ZlIHJlcG9zaXRvcnksIHNpbmNlIGl0IGRlcGVuZHMgb24gdGhlIHBhcnNl ci4KKyAgICAgICAgKENvbW1hbmQubWFpbik6IFN1cHBvcnQgYXJndW1lbnRzIHRvIG1haW4gZnVu Y3Rpb25zLgorICAgICAgICAoRmluZC5wYXJzZXIpOiBSZW1vdmUgcmVwb3NpdG9yeSwgc2luY2Ug aXQgZGVwZW5kcyBvbiB0aGUgcGFyc2VyLgorICAgICAgICAoQ2hlY2tvdXQucGFyc2VyKTogRGl0 dG8uCisgICAgICAgIChDaGVja291dC5tYWluKTogRWFybHkgcmV0dXJuIGlmIHNwZWNpZmllZCBy ZXBvc2l0b3J5IGlzIHJlbW90ZS4KKyAgICAgICAgKG1haW4pOiBDb25zdHJ1Y3QgcmVwb3NpdG9y eSBiYXNlZCBvbiBwYXRoIGFyZ3VtZW50LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY2hlY2tvdXRfdW5pdHRlc3QucHk6CisgICAgICAg IChUZXN0Q2hlY2tvdXQpOgorICAgICAgICAoVGVzdENoZWNrb3V0LnRlc3RfY2hlY2tvdXRfcmVt b3RlKToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2ZpbmRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0RmluZC50ZXN0X2JhaXNjX3N2 bl9yZW1vdGUpOgorCiAyMDIwLTExLTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxl LmNvbT4KIAogICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgcmVtb3RlIFN1YnZlcnNpb24g cmVwb3NpdG9yeQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3MDAzOCkK KysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5p dF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJv cjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFs bCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAg ICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA0LCAwKQordmVyc2lvbiA9IFZlcnNpb24oMCwg NCwgMSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZGF0ZXV0aWwnLCBWZXJzaW9u KDIsIDgsIDEpLCBweXBpX25hbWU9J3B5dGhvbi1kYXRldXRpbCcpKQogQXV0b0luc3RhbGwucmVn aXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9wcm9ncmFtLnB5CShyZXZpc2lvbiAyNzAwMzgpCisrKyBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0yOCw3ICsyOCw3IEBAIGltcG9ydCBzeXMKIAogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRp bWUKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBhcmd1bWVudHMsIGxvZyBhcyB3ZWJraXRjb3Jl cHlfbG9nCi1mcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIGxvY2FsLCBsb2cKK2Zyb20g d2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgbG9jYWwsIGxvZywgcmVtb3RlCiAKIAogY2xhc3Mg Q29tbWFuZChvYmplY3QpOgpAQCAtMzYsMTQgKzM2LDE0IEBAIGNsYXNzIENvbW1hbmQob2JqZWN0 KToKICAgICBoZWxwID0gTm9uZQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHBhcnNlcihj bHMsIHBhcnNlciwgcmVwb3NpdG9yeSk6CisgICAgZGVmIHBhcnNlcihjbHMsIHBhcnNlcik6CiAg ICAgICAgIGlmIGNscy5uYW1lIGlzIE5vbmU6CiAgICAgICAgICAgICByYWlzZSBOb3RJbXBsZW1l bnRlZEVycm9yKCdDb21tYW5kIGRvZXMgbm90IGhhdmUgYSBuYW1lJykKICAgICAgICAgaWYgY2xz LmhlbHAgaXMgTm9uZToKICAgICAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoIid7 fScgZG9lcyBub3QgaGF2ZSBhIGhlbHAgbWVzc2FnZSIpCiAKICAgICBAY2xhc3NtZXRob2QKLSAg ICBkZWYgbWFpbihjbHMsIHJlcG9zaXRvcnkpOgorICAgIGRlZiBtYWluKGNscywgYXJncywgcmVw b3NpdG9yeSk6CiAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ05vIGNvbW1hbmQgc3BlY2lmaWVk XG4nKQogICAgICAgICByZXR1cm4gLTEKIApAQCAtNTMsNyArNTMsNyBAQCBjbGFzcyBGaW5kKENv bW1hbmQpOgogICAgIGhlbHAgPSAnR2l2ZW4gYW4gaWRlbnRpZmllciwgcmV2aXNpb24gb3IgaGFz aCwgbm9ybWFsaXplIGFuZCBwcmludCB0aGUgY29tbWl0JwogCiAgICAgQGNsYXNzbWV0aG9kCi0g ICAgZGVmIHBhcnNlcihjbHMsIHBhcnNlciwgcmVwb3NpdG9yeSwgbG9nZ2Vycz1Ob25lKToKKyAg ICBkZWYgcGFyc2VyKGNscywgcGFyc2VyLCBsb2dnZXJzPU5vbmUpOgogICAgICAgICBhcmd1bWVu dHMuTG9nZ2luZ0dyb3VwKAogICAgICAgICAgICAgcGFyc2VyLAogICAgICAgICAgICAgbG9nZ2Vy cz1sb2dnZXJzLApAQCAtMTIxLDcgKzEyMSw3IEBAIGNsYXNzIENoZWNrb3V0KENvbW1hbmQpOgog ICAgIGhlbHAgPSAnR2l2ZW4gYW4gaWRlbnRpZmllciwgcmV2aXNpb24gb3IgaGFzaCwgbm9ybWFs aXplIGFuZCBjaGVja291dCB0aGF0IGNvbW1pdCcKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRl ZiBwYXJzZXIoY2xzLCBwYXJzZXIsIHJlcG9zaXRvcnksIGxvZ2dlcnM9Tm9uZSk6CisgICAgZGVm IHBhcnNlcihjbHMsIHBhcnNlciwgbG9nZ2Vycz1Ob25lKToKICAgICAgICAgYXJndW1lbnRzLkxv Z2dpbmdHcm91cCgKICAgICAgICAgICAgIHBhcnNlciwKICAgICAgICAgICAgIGxvZ2dlcnM9bG9n Z2VycywKQEAgLTEzNiw2ICsxMzYsMTAgQEAgY2xhc3MgQ2hlY2tvdXQoQ29tbWFuZCk6CiAKICAg ICBAY2xhc3NtZXRob2QKICAgICBkZWYgbWFpbihjbHMsIGFyZ3MsIHJlcG9zaXRvcnkpOgorICAg ICAgICBpZiBub3QgcmVwb3NpdG9yeS5wYXRoOgorICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0 ZSgiQ2Fubm90IGNoZWNrb3V0IG9uIHJlbW90ZSByZXBvc2l0b3J5IikKKyAgICAgICAgICAgIHJl dHVybiAxCisKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgY29tbWl0ID0gcmVwb3NpdG9yeS5j aGVja291dChhcmdzLmFyZ3VtZW50WzBdKQogICAgICAgICBleGNlcHQgKGxvY2FsLlNjbS5FeGNl cHRpb24sIFZhbHVlRXJyb3IpIGFzIGV4Y2VwdGlvbjoKQEAgLTE1NSwyMCArMTU5LDMyIEBAIGRl ZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25lLCBsb2dnZXJzPU4KIAogICAgIGxvZ2dlcnMgPSBb bG9nZ2luZy5nZXRMb2dnZXIoKSwgd2Via2l0Y29yZXB5X2xvZywgIGxvZ10gKyAobG9nZ2VycyBv ciBbXSkKIAotICAgIHJlcG9zaXRvcnkgPSBsb2NhbC5TY20uZnJvbV9wYXRoKHBhdGg9cGF0aCBv ciBvcy5nZXRjd2QoKSkKLQogICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKAog ICAgICAgICBkZXNjcmlwdGlvbj0nQ3VzdG9tIGdpdCB0b29saW5nIGZyb20gdGhlIFdlYktpdCB0 ZWFtIHRvIGludGVyYWN0IHdpdGggYSAnICsKICAgICAgICAgICAgICAgICAgICAgJ3JlcG9zaXRv cnkgdXNpbmcgaWRlbnRpZmVycycsCiAgICAgKQogICAgIGFyZ3VtZW50cy5Mb2dnaW5nR3JvdXAo cGFyc2VyKQorCisgICAgZ3JvdXAgPSBwYXJzZXIuYWRkX2FyZ3VtZW50X2dyb3VwKCdSZXBvc2l0 b3J5JykKKyAgICBncm91cC5hZGRfYXJndW1lbnQoCisgICAgICAgICctLXBhdGgnLCAnLXAnLCAn LUMnLAorICAgICAgICBkZXN0PSdyZXBvc2l0b3J5JywgZGVmYXVsdD1wYXRoIG9yIG9zLmdldGN3 ZCgpLAorICAgICAgICBoZWxwPSdTZXQgdGhlIHJlcG9zaXRvcnkgcGF0aCBvciBVUkwgdG8gYmUg dXNlZCcsCisgICAgICAgIGFjdGlvbj0nc3RvcmUnLAorICAgICkKKwogICAgIHN1YnBhcnNlcnMg PSBwYXJzZXIuYWRkX3N1YnBhcnNlcnMoaGVscD0nc3ViLWNvbW1hbmQgaGVscCcpCiAKICAgICBm b3IgcHJvZ3JhbSBpbiBbRmluZCwgQ2hlY2tvdXRdOgogICAgICAgICBzdWJwYXJzZXIgPSBzdWJw YXJzZXJzLmFkZF9wYXJzZXIocHJvZ3JhbS5uYW1lLCBoZWxwPXByb2dyYW0uaGVscCkKICAgICAg ICAgc3VicGFyc2VyLnNldF9kZWZhdWx0cyhtYWluPXByb2dyYW0ubWFpbikKLSAgICAgICAgcHJv Z3JhbS5wYXJzZXIoc3VicGFyc2VyLCByZXBvc2l0b3J5PXJlcG9zaXRvcnksIGxvZ2dlcnM9bG9n Z2VycykKKyAgICAgICAgcHJvZ3JhbS5wYXJzZXIoc3VicGFyc2VyLCBsb2dnZXJzPWxvZ2dlcnMp CiAKICAgICBwYXJzZWQgPSBwYXJzZXIucGFyc2VfYXJncyhhcmdzPWFyZ3MpCiAKKyAgICBpZiBw YXJzZWQucmVwb3NpdG9yeS5zdGFydHN3aXRoKCdodHRwczovLycpIG9yIHBhcnNlZC5yZXBvc2l0 b3J5LnN0YXJ0c3dpdGgoJ2h0dHA6Ly8nKToKKyAgICAgICAgcmVwb3NpdG9yeSA9IHJlbW90ZS5T Y20uZnJvbV91cmwocGFyc2VkLnJlcG9zaXRvcnkpCisgICAgZWxzZToKKyAgICAgICAgcmVwb3Np dG9yeSA9IGxvY2FsLlNjbS5mcm9tX3BhdGgocGF0aD1wYXJzZWQucmVwb3NpdG9yeSkKKwogICAg IHJldHVybiBwYXJzZWQubWFpbihhcmdzPXBhcnNlZCwgcmVwb3NpdG9yeT1yZXBvc2l0b3J5KQpJ bmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVz dC9jaGVja291dF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NoZWNrb3V0X3VuaXR0ZXN0LnB5CShy ZXZpc2lvbiAyNzAwMzgpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L2NoZWNrb3V0X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02 MiwzICs2MiwxMCBAQCBjbGFzcyBUZXN0Q2hlY2tvdXQodW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICAgICAgKSkKIAogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCg0LCBsb2NhbC5Tdm4o c2VsZi5wYXRoKS5jb21taXQoKS5yZXZpc2lvbikKKworICAgIGRlZiB0ZXN0X2NoZWNrb3V0X3Jl bW90ZShzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuU3ZuKCksIE91dHB1dENhcHR1 cmUoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMSwgcHJvZ3JhbS5tYWluKAorICAg ICAgICAgICAgICAgIGFyZ3M9KCctQycsICdodHRwczovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRv cnkvd2Via2l0JywgJ2NoZWNrb3V0JywgJzNAdHJ1bmsnKSwKKyAgICAgICAgICAgICAgICBwYXRo PXNlbGYucGF0aCwKKyAgICAgICAgICAgICkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVz dC9maW5kX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzAwMzgpCisrKyBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkJKHdv cmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDE0IEBAIGNsYXNzIFRlc3RGaW5kKHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgICAgICkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVy ZWQuc3Rkb3V0LmdldHZhbHVlKCksICc0QHRydW5rIHwgcjYgfCA2dGggY29tbWl0XG4nKQogCisg ICAgZGVmIHRlc3RfYmFpc2Nfc3ZuX3JlbW90ZShzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5y ZW1vdGUuU3ZuKCksIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoKKyAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5tYWluKAorICAgICAgICAgICAgICAgIGFyZ3M9KCct QycsICdodHRwczovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0JywgJ2ZpbmQnLCAn SEVBRCcsICctcScpLAorICAgICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAorICAgICAgICAg ICAgKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0dmFsdWUo KSwgJzRAdHJ1bmsgfCByNiB8IDZ0aCBjb21taXRcbicpCisKICAgICBkZWYgdGVzdF9icmFuY2hf dGlsZGUoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0 X3N2bj1UcnVlKSwgbW9ja3MubG9jYWwuU3ZuKCksIE1vY2tUaW1lLCBPdXRwdXRDYXB0dXJlKCkg YXMgY2FwdHVyZWQ6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFp bigK 415022 2020-11-30 07:50:14 -0800 2020-11-30 10:52:18 -0800 Patch bug-219172-20201130095013.patch text/plain 7248 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDI0NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIwLTExLTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgcmVtb3RlIHJlcG9zaXRvcmllcyBp biBnaXQtd2Via2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTkxNzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk0OTA5PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weToKKyAgICAgICAgKENvbW1hbmQu cGFyc2VyKTogUmVtb3ZlIHJlcG9zaXRvcnksIHNpbmNlIGl0IGRlcGVuZHMgb24gdGhlIHBhcnNl ci4KKyAgICAgICAgKENvbW1hbmQubWFpbik6IFN1cHBvcnQgYXJndW1lbnRzIHRvIG1haW4gZnVu Y3Rpb25zLgorICAgICAgICAoRmluZC5wYXJzZXIpOiBSZW1vdmUgcmVwb3NpdG9yeSwgc2luY2Ug aXQgZGVwZW5kcyBvbiB0aGUgcGFyc2VyLgorICAgICAgICAoQ2hlY2tvdXQucGFyc2VyKTogRGl0 dG8uCisgICAgICAgIChDaGVja291dC5tYWluKTogRWFybHkgcmV0dXJuIGlmIHNwZWNpZmllZCBy ZXBvc2l0b3J5IGlzIHJlbW90ZS4KKyAgICAgICAgKG1haW4pOiBDb25zdHJ1Y3QgcmVwb3NpdG9y eSBiYXNlZCBvbiBwYXRoIGFyZ3VtZW50LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY2hlY2tvdXRfdW5pdHRlc3QucHk6CisgICAgICAg IChUZXN0Q2hlY2tvdXQpOgorICAgICAgICAoVGVzdENoZWNrb3V0LnRlc3RfY2hlY2tvdXRfcmVt b3RlKToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2ZpbmRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0RmluZC50ZXN0X2JhaXNjX3N2 bl9yZW1vdGUpOgorCiAyMDIwLTExLTMwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxl LmNvbT4KIAogICAgICAgICBBdXRvbWF0aWNhbGx5IGRlbGV0ZSBvbGQgZGF0YSBmcm9tIGV3cyBi dWlsZGJvdCBpbnN0YW5jZQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3 MDI0NCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBv cnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAg aW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJM PmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA0LCAwKQordmVyc2lvbiA9IFZlcnNp b24oMCwgNCwgMSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZGF0ZXV0aWwnLCBW ZXJzaW9uKDIsIDgsIDEpLCBweXBpX25hbWU9J3B5dGhvbi1kYXRldXRpbCcpKQogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQpJbmRl eDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3Jh bS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9wcm9ncmFtLnB5CShyZXZpc2lvbiAyNzAyNDQpCisrKyBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtLnB5CSh3b3JraW5nIGNv cHkpCkBAIC0yOCw3ICsyOCw3IEBAIGltcG9ydCBzeXMKIAogZnJvbSBkYXRldGltZSBpbXBvcnQg ZGF0ZXRpbWUKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBhcmd1bWVudHMsIGxvZyBhcyB3ZWJr aXRjb3JlcHlfbG9nCi1mcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIGxvY2FsLCBsb2cK K2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgbG9jYWwsIGxvZywgcmVtb3RlCiAKIAog Y2xhc3MgQ29tbWFuZChvYmplY3QpOgpAQCAtMzYsMTQgKzM2LDE0IEBAIGNsYXNzIENvbW1hbmQo b2JqZWN0KToKICAgICBoZWxwID0gTm9uZQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHBh cnNlcihjbHMsIHBhcnNlciwgcmVwb3NpdG9yeSk6CisgICAgZGVmIHBhcnNlcihjbHMsIHBhcnNl cik6CiAgICAgICAgIGlmIGNscy5uYW1lIGlzIE5vbmU6CiAgICAgICAgICAgICByYWlzZSBOb3RJ bXBsZW1lbnRlZEVycm9yKCdDb21tYW5kIGRvZXMgbm90IGhhdmUgYSBuYW1lJykKICAgICAgICAg aWYgY2xzLmhlbHAgaXMgTm9uZToKICAgICAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJy b3IoIid7fScgZG9lcyBub3QgaGF2ZSBhIGhlbHAgbWVzc2FnZSIpCiAKICAgICBAY2xhc3NtZXRo b2QKLSAgICBkZWYgbWFpbihjbHMsIHJlcG9zaXRvcnkpOgorICAgIGRlZiBtYWluKGNscywgYXJn cywgcmVwb3NpdG9yeSk6CiAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ05vIGNvbW1hbmQgc3Bl Y2lmaWVkXG4nKQogICAgICAgICByZXR1cm4gLTEKIApAQCAtNTMsNyArNTMsNyBAQCBjbGFzcyBG aW5kKENvbW1hbmQpOgogICAgIGhlbHAgPSAnR2l2ZW4gYW4gaWRlbnRpZmllciwgcmV2aXNpb24g b3IgaGFzaCwgbm9ybWFsaXplIGFuZCBwcmludCB0aGUgY29tbWl0JwogCiAgICAgQGNsYXNzbWV0 aG9kCi0gICAgZGVmIHBhcnNlcihjbHMsIHBhcnNlciwgcmVwb3NpdG9yeSwgbG9nZ2Vycz1Ob25l KToKKyAgICBkZWYgcGFyc2VyKGNscywgcGFyc2VyLCBsb2dnZXJzPU5vbmUpOgogICAgICAgICBh cmd1bWVudHMuTG9nZ2luZ0dyb3VwKAogICAgICAgICAgICAgcGFyc2VyLAogICAgICAgICAgICAg bG9nZ2Vycz1sb2dnZXJzLApAQCAtMTIxLDcgKzEyMSw3IEBAIGNsYXNzIENoZWNrb3V0KENvbW1h bmQpOgogICAgIGhlbHAgPSAnR2l2ZW4gYW4gaWRlbnRpZmllciwgcmV2aXNpb24gb3IgaGFzaCwg bm9ybWFsaXplIGFuZCBjaGVja291dCB0aGF0IGNvbW1pdCcKIAogICAgIEBjbGFzc21ldGhvZAot ICAgIGRlZiBwYXJzZXIoY2xzLCBwYXJzZXIsIHJlcG9zaXRvcnksIGxvZ2dlcnM9Tm9uZSk6Cisg ICAgZGVmIHBhcnNlcihjbHMsIHBhcnNlciwgbG9nZ2Vycz1Ob25lKToKICAgICAgICAgYXJndW1l bnRzLkxvZ2dpbmdHcm91cCgKICAgICAgICAgICAgIHBhcnNlciwKICAgICAgICAgICAgIGxvZ2dl cnM9bG9nZ2VycywKQEAgLTEzNiw2ICsxMzYsMTAgQEAgY2xhc3MgQ2hlY2tvdXQoQ29tbWFuZCk6 CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgbWFpbihjbHMsIGFyZ3MsIHJlcG9zaXRvcnkp OgorICAgICAgICBpZiBub3QgcmVwb3NpdG9yeS5wYXRoOgorICAgICAgICAgICAgc3lzLnN0ZGVy ci53cml0ZSgiQ2Fubm90IGNoZWNrb3V0IG9uIHJlbW90ZSByZXBvc2l0b3J5IikKKyAgICAgICAg ICAgIHJldHVybiAxCisKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgY29tbWl0ID0gcmVwb3Np dG9yeS5jaGVja291dChhcmdzLmFyZ3VtZW50WzBdKQogICAgICAgICBleGNlcHQgKGxvY2FsLlNj bS5FeGNlcHRpb24sIFZhbHVlRXJyb3IpIGFzIGV4Y2VwdGlvbjoKQEAgLTE1NSwyMCArMTU5LDMy IEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25lLCBsb2dnZXJzPU4KIAogICAgIGxvZ2dl cnMgPSBbbG9nZ2luZy5nZXRMb2dnZXIoKSwgd2Via2l0Y29yZXB5X2xvZywgIGxvZ10gKyAobG9n Z2VycyBvciBbXSkKIAotICAgIHJlcG9zaXRvcnkgPSBsb2NhbC5TY20uZnJvbV9wYXRoKHBhdGg9 cGF0aCBvciBvcy5nZXRjd2QoKSkKLQogICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFy c2VyKAogICAgICAgICBkZXNjcmlwdGlvbj0nQ3VzdG9tIGdpdCB0b29saW5nIGZyb20gdGhlIFdl YktpdCB0ZWFtIHRvIGludGVyYWN0IHdpdGggYSAnICsKICAgICAgICAgICAgICAgICAgICAgJ3Jl cG9zaXRvcnkgdXNpbmcgaWRlbnRpZmVycycsCiAgICAgKQogICAgIGFyZ3VtZW50cy5Mb2dnaW5n R3JvdXAocGFyc2VyKQorCisgICAgZ3JvdXAgPSBwYXJzZXIuYWRkX2FyZ3VtZW50X2dyb3VwKCdS ZXBvc2l0b3J5JykKKyAgICBncm91cC5hZGRfYXJndW1lbnQoCisgICAgICAgICctLXBhdGgnLCAn LXAnLCAnLUMnLAorICAgICAgICBkZXN0PSdyZXBvc2l0b3J5JywgZGVmYXVsdD1wYXRoIG9yIG9z LmdldGN3ZCgpLAorICAgICAgICBoZWxwPSdTZXQgdGhlIHJlcG9zaXRvcnkgcGF0aCBvciBVUkwg dG8gYmUgdXNlZCcsCisgICAgICAgIGFjdGlvbj0nc3RvcmUnLAorICAgICkKKwogICAgIHN1YnBh cnNlcnMgPSBwYXJzZXIuYWRkX3N1YnBhcnNlcnMoaGVscD0nc3ViLWNvbW1hbmQgaGVscCcpCiAK ICAgICBmb3IgcHJvZ3JhbSBpbiBbRmluZCwgQ2hlY2tvdXRdOgogICAgICAgICBzdWJwYXJzZXIg PSBzdWJwYXJzZXJzLmFkZF9wYXJzZXIocHJvZ3JhbS5uYW1lLCBoZWxwPXByb2dyYW0uaGVscCkK ICAgICAgICAgc3VicGFyc2VyLnNldF9kZWZhdWx0cyhtYWluPXByb2dyYW0ubWFpbikKLSAgICAg ICAgcHJvZ3JhbS5wYXJzZXIoc3VicGFyc2VyLCByZXBvc2l0b3J5PXJlcG9zaXRvcnksIGxvZ2dl cnM9bG9nZ2VycykKKyAgICAgICAgcHJvZ3JhbS5wYXJzZXIoc3VicGFyc2VyLCBsb2dnZXJzPWxv Z2dlcnMpCiAKICAgICBwYXJzZWQgPSBwYXJzZXIucGFyc2VfYXJncyhhcmdzPWFyZ3MpCiAKKyAg ICBpZiBwYXJzZWQucmVwb3NpdG9yeS5zdGFydHN3aXRoKCdodHRwczovLycpIG9yIHBhcnNlZC5y ZXBvc2l0b3J5LnN0YXJ0c3dpdGgoJ2h0dHA6Ly8nKToKKyAgICAgICAgcmVwb3NpdG9yeSA9IHJl bW90ZS5TY20uZnJvbV91cmwocGFyc2VkLnJlcG9zaXRvcnkpCisgICAgZWxzZToKKyAgICAgICAg cmVwb3NpdG9yeSA9IGxvY2FsLlNjbS5mcm9tX3BhdGgocGF0aD1wYXJzZWQucmVwb3NpdG9yeSkK KwogICAgIHJldHVybiBwYXJzZWQubWFpbihhcmdzPXBhcnNlZCwgcmVwb3NpdG9yeT1yZXBvc2l0 b3J5KQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9jaGVja291dF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NoZWNrb3V0X3VuaXR0ZXN0 LnB5CShyZXZpc2lvbiAyNzAyNDQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L2NoZWNrb3V0X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkp CkBAIC02MiwzICs2MiwxMCBAQCBjbGFzcyBUZXN0Q2hlY2tvdXQodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICAgICAgKSkKIAogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCg0LCBsb2Nh bC5Tdm4oc2VsZi5wYXRoKS5jb21taXQoKS5yZXZpc2lvbikKKworICAgIGRlZiB0ZXN0X2NoZWNr b3V0X3JlbW90ZShzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuU3ZuKCksIE91dHB1 dENhcHR1cmUoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMSwgcHJvZ3JhbS5tYWlu KAorICAgICAgICAgICAgICAgIGFyZ3M9KCctQycsICdodHRwczovL3N2bi53ZWJraXQub3JnL3Jl cG9zaXRvcnkvd2Via2l0JywgJ2NoZWNrb3V0JywgJzNAdHJ1bmsnKSwKKyAgICAgICAgICAgICAg ICBwYXRoPXNlbGYucGF0aCwKKyAgICAgICAgICAgICkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9maW5kX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzAyNDQpCisrKyBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3Qu cHkJKHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDE0IEBAIGNsYXNzIFRlc3RGaW5kKHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo Y2FwdHVyZWQuc3Rkb3V0LmdldHZhbHVlKCksICc0QHRydW5rIHwgcjYgfCA2dGggY29tbWl0XG4n KQogCisgICAgZGVmIHRlc3RfYmFzaWNfc3ZuX3JlbW90ZShzZWxmKToKKyAgICAgICAgd2l0aCBt b2Nrcy5yZW1vdGUuU3ZuKCksIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5tYWluKAorICAgICAgICAgICAgICAgIGFy Z3M9KCctQycsICdodHRwczovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0JywgJ2Zp bmQnLCAnSEVBRCcsICctcScpLAorICAgICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAorICAg ICAgICAgICAgKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0 dmFsdWUoKSwgJzRAdHJ1bmsgfCByNiB8IDZ0aCBjb21taXRcbicpCisKICAgICBkZWYgdGVzdF9i cmFuY2hfdGlsZGUoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0 aCwgZ2l0X3N2bj1UcnVlKSwgbW9ja3MubG9jYWwuU3ZuKCksIE1vY2tUaW1lLCBPdXRwdXRDYXB0 dXJlKCkgYXMgY2FwdHVyZWQ6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dy YW0ubWFpbigK 415033 2020-11-30 10:52:20 -0800 2020-11-30 11:23:31 -0800 Patch bug-219172-20201130125219.patch text/plain 7251 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDI0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIwLTExLTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgcmVtb3RlIHJlcG9zaXRvcmllcyBp biBnaXQtd2Via2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTkxNzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk0OTA5PgorCisgICAgICAg IFJ1YmJlci1zdGFtcGVkIGJ5IEFha2FzaCBKYWluLgorCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weToKKyAgICAgICAgKENvbW1h bmQucGFyc2VyKTogUmVtb3ZlIHJlcG9zaXRvcnksIHNpbmNlIGl0IGRlcGVuZHMgb24gdGhlIHBh cnNlci4KKyAgICAgICAgKENvbW1hbmQubWFpbik6IFN1cHBvcnQgYXJndW1lbnRzIHRvIG1haW4g ZnVuY3Rpb25zLgorICAgICAgICAoRmluZC5wYXJzZXIpOiBSZW1vdmUgcmVwb3NpdG9yeSwgc2lu Y2UgaXQgZGVwZW5kcyBvbiB0aGUgcGFyc2VyLgorICAgICAgICAoQ2hlY2tvdXQucGFyc2VyKTog RGl0dG8uCisgICAgICAgIChDaGVja291dC5tYWluKTogRWFybHkgcmV0dXJuIGlmIHNwZWNpZmll ZCByZXBvc2l0b3J5IGlzIHJlbW90ZS4KKyAgICAgICAgKG1haW4pOiBDb25zdHJ1Y3QgcmVwb3Np dG9yeSBiYXNlZCBvbiBwYXRoIGFyZ3VtZW50LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY2hlY2tvdXRfdW5pdHRlc3QucHk6CisgICAg ICAgIChUZXN0Q2hlY2tvdXQpOgorICAgICAgICAoVGVzdENoZWNrb3V0LnRlc3RfY2hlY2tvdXRf cmVtb3RlKToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0RmluZC50ZXN0X2JhaXNj X3N2bl9yZW1vdGUpOgorCiAyMDIwLTExLTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFw cGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0c2NtcHldIHdlYmtpdHNjbXB5LnRlc3Quc3ZuX3Vu aXR0ZXN0LlRlc3RSZW1vdGVTdm4udGVzdF9pbmZvIHRpbWV6b25lIGRlcGVuZGVudApJbmRleDog VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18u cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3MDI0NykKKysrIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNv cHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFz ZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1l eHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0g VmVyc2lvbigwLCA0LCAwKQordmVyc2lvbiA9IFZlcnNpb24oMCwgNCwgMSkKIAogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgnZGF0ZXV0aWwnLCBWZXJzaW9uKDIsIDgsIDEpLCBweXBpX25h bWU9J3B5dGhvbi1kYXRldXRpbCcpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFz dGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtLnB5CShy ZXZpc2lvbiAyNzAyNDcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9wcm9ncmFtLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw3IEBAIGlt cG9ydCBzeXMKIAogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUKIGZyb20gd2Via2l0Y29y ZXB5IGltcG9ydCBhcmd1bWVudHMsIGxvZyBhcyB3ZWJraXRjb3JlcHlfbG9nCi1mcm9tIHdlYmtp dHNjbXB5IGltcG9ydCBDb21taXQsIGxvY2FsLCBsb2cKK2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0 IENvbW1pdCwgbG9jYWwsIGxvZywgcmVtb3RlCiAKIAogY2xhc3MgQ29tbWFuZChvYmplY3QpOgpA QCAtMzYsMTQgKzM2LDE0IEBAIGNsYXNzIENvbW1hbmQob2JqZWN0KToKICAgICBoZWxwID0gTm9u ZQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHBhcnNlcihjbHMsIHBhcnNlciwgcmVwb3Np dG9yeSk6CisgICAgZGVmIHBhcnNlcihjbHMsIHBhcnNlcik6CiAgICAgICAgIGlmIGNscy5uYW1l IGlzIE5vbmU6CiAgICAgICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCdDb21tYW5k IGRvZXMgbm90IGhhdmUgYSBuYW1lJykKICAgICAgICAgaWYgY2xzLmhlbHAgaXMgTm9uZToKICAg ICAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoIid7fScgZG9lcyBub3QgaGF2ZSBh IGhlbHAgbWVzc2FnZSIpCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbWFpbihjbHMsIHJl cG9zaXRvcnkpOgorICAgIGRlZiBtYWluKGNscywgYXJncywgcmVwb3NpdG9yeSk6CiAgICAgICAg IHN5cy5zdGRlcnIud3JpdGUoJ05vIGNvbW1hbmQgc3BlY2lmaWVkXG4nKQogICAgICAgICByZXR1 cm4gLTEKIApAQCAtNTMsNyArNTMsNyBAQCBjbGFzcyBGaW5kKENvbW1hbmQpOgogICAgIGhlbHAg PSAnR2l2ZW4gYW4gaWRlbnRpZmllciwgcmV2aXNpb24gb3IgaGFzaCwgbm9ybWFsaXplIGFuZCBw cmludCB0aGUgY29tbWl0JwogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHBhcnNlcihjbHMs IHBhcnNlciwgcmVwb3NpdG9yeSwgbG9nZ2Vycz1Ob25lKToKKyAgICBkZWYgcGFyc2VyKGNscywg cGFyc2VyLCBsb2dnZXJzPU5vbmUpOgogICAgICAgICBhcmd1bWVudHMuTG9nZ2luZ0dyb3VwKAog ICAgICAgICAgICAgcGFyc2VyLAogICAgICAgICAgICAgbG9nZ2Vycz1sb2dnZXJzLApAQCAtMTIx LDcgKzEyMSw3IEBAIGNsYXNzIENoZWNrb3V0KENvbW1hbmQpOgogICAgIGhlbHAgPSAnR2l2ZW4g YW4gaWRlbnRpZmllciwgcmV2aXNpb24gb3IgaGFzaCwgbm9ybWFsaXplIGFuZCBjaGVja291dCB0 aGF0IGNvbW1pdCcKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBwYXJzZXIoY2xzLCBwYXJz ZXIsIHJlcG9zaXRvcnksIGxvZ2dlcnM9Tm9uZSk6CisgICAgZGVmIHBhcnNlcihjbHMsIHBhcnNl ciwgbG9nZ2Vycz1Ob25lKToKICAgICAgICAgYXJndW1lbnRzLkxvZ2dpbmdHcm91cCgKICAgICAg ICAgICAgIHBhcnNlciwKICAgICAgICAgICAgIGxvZ2dlcnM9bG9nZ2VycywKQEAgLTEzNiw2ICsx MzYsMTAgQEAgY2xhc3MgQ2hlY2tvdXQoQ29tbWFuZCk6CiAKICAgICBAY2xhc3NtZXRob2QKICAg ICBkZWYgbWFpbihjbHMsIGFyZ3MsIHJlcG9zaXRvcnkpOgorICAgICAgICBpZiBub3QgcmVwb3Np dG9yeS5wYXRoOgorICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiQ2Fubm90IGNoZWNrb3V0 IG9uIHJlbW90ZSByZXBvc2l0b3J5IikKKyAgICAgICAgICAgIHJldHVybiAxCisKICAgICAgICAg dHJ5OgogICAgICAgICAgICAgY29tbWl0ID0gcmVwb3NpdG9yeS5jaGVja291dChhcmdzLmFyZ3Vt ZW50WzBdKQogICAgICAgICBleGNlcHQgKGxvY2FsLlNjbS5FeGNlcHRpb24sIFZhbHVlRXJyb3Ip IGFzIGV4Y2VwdGlvbjoKQEAgLTE1NSwyMCArMTU5LDMyIEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwg cGF0aD1Ob25lLCBsb2dnZXJzPU4KIAogICAgIGxvZ2dlcnMgPSBbbG9nZ2luZy5nZXRMb2dnZXIo KSwgd2Via2l0Y29yZXB5X2xvZywgIGxvZ10gKyAobG9nZ2VycyBvciBbXSkKIAotICAgIHJlcG9z aXRvcnkgPSBsb2NhbC5TY20uZnJvbV9wYXRoKHBhdGg9cGF0aCBvciBvcy5nZXRjd2QoKSkKLQog ICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKAogICAgICAgICBkZXNjcmlwdGlv bj0nQ3VzdG9tIGdpdCB0b29saW5nIGZyb20gdGhlIFdlYktpdCB0ZWFtIHRvIGludGVyYWN0IHdp dGggYSAnICsKICAgICAgICAgICAgICAgICAgICAgJ3JlcG9zaXRvcnkgdXNpbmcgaWRlbnRpZmVy cycsCiAgICAgKQogICAgIGFyZ3VtZW50cy5Mb2dnaW5nR3JvdXAocGFyc2VyKQorCisgICAgZ3Jv dXAgPSBwYXJzZXIuYWRkX2FyZ3VtZW50X2dyb3VwKCdSZXBvc2l0b3J5JykKKyAgICBncm91cC5h ZGRfYXJndW1lbnQoCisgICAgICAgICctLXBhdGgnLCAnLXAnLCAnLUMnLAorICAgICAgICBkZXN0 PSdyZXBvc2l0b3J5JywgZGVmYXVsdD1wYXRoIG9yIG9zLmdldGN3ZCgpLAorICAgICAgICBoZWxw PSdTZXQgdGhlIHJlcG9zaXRvcnkgcGF0aCBvciBVUkwgdG8gYmUgdXNlZCcsCisgICAgICAgIGFj dGlvbj0nc3RvcmUnLAorICAgICkKKwogICAgIHN1YnBhcnNlcnMgPSBwYXJzZXIuYWRkX3N1YnBh cnNlcnMoaGVscD0nc3ViLWNvbW1hbmQgaGVscCcpCiAKICAgICBmb3IgcHJvZ3JhbSBpbiBbRmlu ZCwgQ2hlY2tvdXRdOgogICAgICAgICBzdWJwYXJzZXIgPSBzdWJwYXJzZXJzLmFkZF9wYXJzZXIo cHJvZ3JhbS5uYW1lLCBoZWxwPXByb2dyYW0uaGVscCkKICAgICAgICAgc3VicGFyc2VyLnNldF9k ZWZhdWx0cyhtYWluPXByb2dyYW0ubWFpbikKLSAgICAgICAgcHJvZ3JhbS5wYXJzZXIoc3VicGFy c2VyLCByZXBvc2l0b3J5PXJlcG9zaXRvcnksIGxvZ2dlcnM9bG9nZ2VycykKKyAgICAgICAgcHJv Z3JhbS5wYXJzZXIoc3VicGFyc2VyLCBsb2dnZXJzPWxvZ2dlcnMpCiAKICAgICBwYXJzZWQgPSBw YXJzZXIucGFyc2VfYXJncyhhcmdzPWFyZ3MpCiAKKyAgICBpZiBwYXJzZWQucmVwb3NpdG9yeS5z dGFydHN3aXRoKCgnaHR0cHM6Ly8nLCAnaHR0cDovLycpKToKKyAgICAgICAgcmVwb3NpdG9yeSA9 IHJlbW90ZS5TY20uZnJvbV91cmwocGFyc2VkLnJlcG9zaXRvcnkpCisgICAgZWxzZToKKyAgICAg ICAgcmVwb3NpdG9yeSA9IGxvY2FsLlNjbS5mcm9tX3BhdGgocGF0aD1wYXJzZWQucmVwb3NpdG9y eSkKKwogICAgIHJldHVybiBwYXJzZWQubWFpbihhcmdzPXBhcnNlZCwgcmVwb3NpdG9yeT1yZXBv c2l0b3J5KQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvdGVzdC9jaGVja291dF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NoZWNrb3V0X3VuaXR0 ZXN0LnB5CShyZXZpc2lvbiAyNzAyNDcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS90ZXN0L2NoZWNrb3V0X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNv cHkpCkBAIC02MiwzICs2MiwxMCBAQCBjbGFzcyBUZXN0Q2hlY2tvdXQodW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICAgICAgKSkKIAogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCg0LCBs b2NhbC5Tdm4oc2VsZi5wYXRoKS5jb21taXQoKS5yZXZpc2lvbikKKworICAgIGRlZiB0ZXN0X2No ZWNrb3V0X3JlbW90ZShzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuU3ZuKCksIE91 dHB1dENhcHR1cmUoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMSwgcHJvZ3JhbS5t YWluKAorICAgICAgICAgICAgICAgIGFyZ3M9KCctQycsICdodHRwczovL3N2bi53ZWJraXQub3Jn L3JlcG9zaXRvcnkvd2Via2l0JywgJ2NoZWNrb3V0JywgJzNAdHJ1bmsnKSwKKyAgICAgICAgICAg ICAgICBwYXRoPXNlbGYucGF0aCwKKyAgICAgICAgICAgICkpCkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvdGVzdC9maW5kX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzAyNDcpCisrKyBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRl c3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDE0IEBAIGNsYXNzIFRlc3RGaW5kKHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoY2FwdHVyZWQuc3Rkb3V0LmdldHZhbHVlKCksICc0QHRydW5rIHwgcjYgfCA2dGggY29tbWl0 XG4nKQogCisgICAgZGVmIHRlc3RfYmFzaWNfc3ZuX3JlbW90ZShzZWxmKToKKyAgICAgICAgd2l0 aCBtb2Nrcy5yZW1vdGUuU3ZuKCksIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5tYWluKAorICAgICAgICAgICAgICAg IGFyZ3M9KCctQycsICdodHRwczovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0Jywg J2ZpbmQnLCAnSEVBRCcsICctcScpLAorICAgICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAor ICAgICAgICAgICAgKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQu Z2V0dmFsdWUoKSwgJzRAdHJ1bmsgfCByNiB8IDZ0aCBjb21taXRcbicpCisKICAgICBkZWYgdGVz dF9icmFuY2hfdGlsZGUoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYu cGF0aCwgZ2l0X3N2bj1UcnVlKSwgbW9ja3MubG9jYWwuU3ZuKCksIE1vY2tUaW1lLCBPdXRwdXRD YXB0dXJlKCkgYXMgY2FwdHVyZWQ6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHBy b2dyYW0ubWFpbigK