215573 2020-08-17 09:26:48 -0700 [resultsdbpy]: Depend on webkitcorepy 2020-08-17 13:53:26 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1680827 0 jbedard 2020-08-17 09:26:48 -0700 There are a few parts of resultsdbpy that should really be broken into independent packages because other services need them. The first step in that process is for resultsdbpy to depend on the library that some tooling is to be moved to. 1680829 1 webkit-bug-importer 2020-08-17 09:27:04 -0700 <rdar://problem/67250272> 1680830 2 406720 jbedard 2020-08-17 09:31:35 -0700 Created attachment 406720 Patch 1680833 3 406721 jbedard 2020-08-17 09:37:57 -0700 Created attachment 406721 Patch 1680835 4 406721 aakash_jain 2020-08-17 09:49:48 -0700 Comment on attachment 406721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406721&action=review > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py:25 > + Better to make below code a method, like: https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py#L17 _add_webkitpy_to_sys_path() > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py:26 > +# Hopefully we're beside webkitcorepy, otherwise it will need to be installed 'it' is ambiguous. Please replace with 'webkitcorepy'. Nit: missing full-stop at the end. Also, can you check if it's install and print a nice message if it isn't installed? > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py:27 > +containing = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(__file__)))) 'containing' should be renamed to name of actual folder, e.g.: libraries_path > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py:28 > +path_addition = os.path.join(containing, 'webkitcorepy') should be 'webkitcorepy_path' 'addition' seems out of context. 1680847 5 406721 jbedard 2020-08-17 10:14:16 -0700 Comment on attachment 406721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406721&action=review >> Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py:26 >> +# Hopefully we're beside webkitcorepy, otherwise it will need to be installed > > 'it' is ambiguous. Please replace with 'webkitcorepy'. > Nit: missing full-stop at the end. > > Also, can you check if it's install and print a nice message if it isn't installed? Other than the error message you'll get on line 32 when you try and use the library? When we have this situation with other packages we own, I intend to have sort of "include or auto-install" function, but we obviously can't auto-install the library that has the auto-installer in it.... 1680852 6 aakash_jain 2020-08-17 10:28:13 -0700 (In reply to Jonathan Bedard from comment #5) > > Also, can you check if it's install and print a nice message if it isn't installed? > > Other than the error message you'll get on line 32 when you try and use the library? > > When we have this situation with other packages we own, I intend to have sort of "include or auto-install" function, but we obviously can't auto-install the library that has the auto-installer in it.... Yeah, i am not referring to auto-installing webkitcorepy. I am only referring to better error message when import fails. e.g.: https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/test/main.py#L260 Something like: try: import package_name except ImportError: _log.error('Failed to import webkitcorepy:, Please do XYZ to install this package') Although it's ok without custom error message as well. 1680877 7 406729 jbedard 2020-08-17 12:21:45 -0700 Created attachment 406729 Patch 1680904 8 406740 jbedard 2020-08-17 13:26:35 -0700 Created attachment 406740 Patch for landing 1680911 9 ews-feeder 2020-08-17 13:53:25 -0700 Committed r265771: <https://trac.webkit.org/changeset/265771> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406740. 406720 2020-08-17 09:31:35 -0700 2020-08-17 09:37:55 -0700 Patch bug-215573-20200817093134.patch text/plain 4578 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTc1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTA4LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0c2RicHldOiBEZXBlbmQgb24gd2Via2l0Y29yZXB5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU1NzMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3MjUwMjcyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvX19pbml0X18ucHk6IERlcGVuZCBvbiB3ZWJraXRjb3JlcHkuCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0dXAucHk6IEFkZCB3ZWJraXRjb3JlcHks IHJlbW92ZSB3ZWJraXRjb3JlcHkncyBkZXBlbmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5OiBBZGQgc2l4IGFzIGEgZGVwZW5kZW5jeS4K KyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19f aW5pdF9fLnB5OiBJbmNsdWRlLiBwYWNrYWdlIG5hbWUsIGJ1bXAgdmVyc2lvbi4KKwogMjAyMC0w OC0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS11bV1BFXSBSZW1vdmUgc3VwcG9ydCBmb3IgTlBBUEkgcGx1Z2lucwpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0dXAucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0dXAucHkJKHJldmlzaW9uIDI2 NTcyNykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVwLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTktMjAyMCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK QEAgLTIwLDYgKzIwLDcgQEAKICMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K IAorZnJvbSByZXN1bHRzZGJweSBpbXBvcnQgdmVyc2lvbgogZnJvbSBzZXR1cHRvb2xzIGltcG9y dCBzZXR1cAogCiAKQEAgLTMwLDcgKzMxLDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAg ICBuYW1lPSdyZXN1bHRzZGJweScsCi0gICAgdmVyc2lvbj0nMC45LjAnLAorICAgIHZlcnNpb249 c3RyKHZlcnNpb24pLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGZvciB2aXN1YWxpemluZywg cHJvY2Vzc2luZyBhbmQgc3RvcmluZyB0ZXN0IHJlc3VsdHMuJywKICAgICBsb25nX2Rlc2NyaXB0 aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKQEAgLTU3LDEyICs1OCwxMCBAQCBzZXR1 cCgKICAgICAgICAgJ0ZsYXNrLUNvcnMnLAogICAgICAgICAnZ3VuaWNvcm4nLAogICAgICAgICAn bHVwYScsCi0gICAgICAgICdtb2NrJywKICAgICAgICAgJ3JlZGlzJywKICAgICAgICAgJ3htbHRv ZGljdCcsCi0gICAgICAgICdyZXF1ZXN0cycsCiAgICAgICAgICdzZWxlbml1bScsCi0gICAgICAg ICdzaXgnLAorICAgICAgICAnd2Via2l0Y29yZXB5JywKICAgICBdLAogICAgIGluY2x1ZGVfcGFj a2FnZV9kYXRhPVRydWUsCiAgICAgemlwX3NhZmU9RmFsc2UsCkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9fX2luaXRfXy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9fX2lu aXRfXy5weQkocmV2aXNpb24gMjY1NzI3KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVz dWx0c2RicHkvcmVzdWx0c2RicHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDQg KzIwLDE5IEBACiAjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9y dCBsb2dnaW5nCitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKKworbG9nID0gbG9nZ2luZy5nZXRMb2dn ZXIoJ2l0ZGV2aWNlbWFuYWdlbWVudHB5JykKKworIyBIb3BlZnVsbHkgd2UncmUgYmVzaWRlIHdl YmtpdGNvcmVweSwgb3RoZXJ3aXNlIGl0IHdpbGwgbmVlZCB0byBiZSBpbnN0YWxsZWQKK2NvbnRh aW5pbmcgPSBvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJzcGF0aChv cy5wYXRoLmRpcm5hbWUoX19maWxlX18pKSkpCitwYXRoX2FkZGl0aW9uID0gb3MucGF0aC5qb2lu KGNvbnRhaW5pbmcsICd3ZWJraXRjb3JlcHknKQoraWYgb3MucGF0aC5pc2RpcihwYXRoX2FkZGl0 aW9uKSBhbmQgb3MucGF0aC5pc2Rpcihvcy5wYXRoLmpvaW4ocGF0aF9hZGRpdGlvbiwgJ3dlYmtp dGNvcmVweScpKSBhbmQgcGF0aF9hZGRpdGlvbiBub3QgaW4gc3lzLnBhdGg6CisgICAgc3lzLnBh dGguaW5zZXJ0KDAsIHBhdGhfYWRkaXRpb24pCisKK2Zyb20gd2Via2l0Y29yZXB5LnZlcnNpb24g aW1wb3J0IFZlcnNpb24KK3ZlcnNpb24gPSBWZXJzaW9uKDEsIDAsIDApCisKIG5hbWUgPSAncmVz dWx0c2RicHknCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0 dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3NldHVwLnB5CShyZXZpc2lvbiAyNjU3MjcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvc2V0dXAucHkJKHdvcmtpbmcgY29weSkKQEAgLTUyLDYgKzUyLDcgQEAgc2V0 dXAoCiAgICAgaW5zdGFsbF9yZXF1aXJlcz1bCiAgICAgICAgICdtb2NrJywKICAgICAgICAgJ3Jl cXVlc3RzJywKKyAgICAgICAgJ3NpeCcsCiAgICAgXSwKICAgICBpbmNsdWRlX3BhY2thZ2VfZGF0 YT1UcnVlLAogICAgIHppcF9zYWZlPUZhbHNlLApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9f LnB5CShyZXZpc2lvbiAyNjU3MjcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICsz Miw3IEBAIGxvZy5hZGRIYW5kbGVyKE51bGxIYW5kbGVyKCkpCiBmcm9tIHdlYmtpdGNvcmVweS52 ZXJzaW9uIGltcG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMgaW1w b3J0IEJ5dGVzSU8sIFN0cmluZ0lPLCBVbmljb2RlSU8sIHVuaWNvZGUKIAotdmVyc2lvbiA9IFZl cnNpb24oMCwgMiwgMykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDIsIDQpCiAKIGZyb20gd2Via2l0 Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZl cnNpb25faW5mbyA+ICgzLCAwKToKQEAgLTUzLDMgKzUzLDUgQEAgQXV0b0luc3RhbGwucmVnaXN0 ZXIoUGFja2FnZSgnc2V0dXB0b29scwogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc29j a3MnLCBWZXJzaW9uKDEsIDcsIDEpLCBweXBpX25hbWU9J1B5U29ja3MnKSkKIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ3NpeCcsIFZlcnNpb24oMSwgMTUsIDApKSkKIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ3VybGxpYjMnLCBWZXJzaW9uKDEsIDI1LCAxMCkpKQorCituYW1l ID0gJ3dlYmtpdGNvcmVweScK 406721 2020-08-17 09:37:57 -0700 2020-08-17 12:21:43 -0700 Patch bug-215573-20200817093756.patch text/plain 4511 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTc1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTA4LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0c2RicHldOiBEZXBlbmQgb24gd2Via2l0Y29yZXB5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU1NzMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3MjUwMjcyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvX19pbml0X18ucHk6IERlcGVuZCBvbiB3ZWJraXRjb3JlcHkuCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0dXAucHk6IEFkZCB3ZWJraXRjb3JlcHks IHJlbW92ZSB3ZWJraXRjb3JlcHkncyBkZXBlbmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5OiBBZGQgc2l4IGFzIGEgZGVwZW5kZW5jeS4K KyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19f aW5pdF9fLnB5OiBJbmNsdWRlLiBwYWNrYWdlIG5hbWUsIGJ1bXAgdmVyc2lvbi4KKwogMjAyMC0w OC0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS11bV1BFXSBSZW1vdmUgc3VwcG9ydCBmb3IgTlBBUEkgcGx1Z2lucwpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0dXAucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0dXAucHkJKHJldmlzaW9uIDI2 NTcyNykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVwLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTktMjAyMCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK QEAgLTIwLDYgKzIwLDcgQEAKICMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K IAorZnJvbSByZXN1bHRzZGJweSBpbXBvcnQgdmVyc2lvbgogZnJvbSBzZXR1cHRvb2xzIGltcG9y dCBzZXR1cAogCiAKQEAgLTMwLDcgKzMxLDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAg ICBuYW1lPSdyZXN1bHRzZGJweScsCi0gICAgdmVyc2lvbj0nMC45LjAnLAorICAgIHZlcnNpb249 c3RyKHZlcnNpb24pLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGZvciB2aXN1YWxpemluZywg cHJvY2Vzc2luZyBhbmQgc3RvcmluZyB0ZXN0IHJlc3VsdHMuJywKICAgICBsb25nX2Rlc2NyaXB0 aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKQEAgLTU3LDEyICs1OCwxMCBAQCBzZXR1 cCgKICAgICAgICAgJ0ZsYXNrLUNvcnMnLAogICAgICAgICAnZ3VuaWNvcm4nLAogICAgICAgICAn bHVwYScsCi0gICAgICAgICdtb2NrJywKICAgICAgICAgJ3JlZGlzJywKICAgICAgICAgJ3htbHRv ZGljdCcsCi0gICAgICAgICdyZXF1ZXN0cycsCiAgICAgICAgICdzZWxlbml1bScsCi0gICAgICAg ICdzaXgnLAorICAgICAgICAnd2Via2l0Y29yZXB5JywKICAgICBdLAogICAgIGluY2x1ZGVfcGFj a2FnZV9kYXRhPVRydWUsCiAgICAgemlwX3NhZmU9RmFsc2UsCkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9fX2luaXRfXy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9fX2lu aXRfXy5weQkocmV2aXNpb24gMjY1NzI3KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVz dWx0c2RicHkvcmVzdWx0c2RicHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDQg KzIwLDE2IEBACiAjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9y dCBvcworaW1wb3J0IHN5cworCisjIEhvcGVmdWxseSB3ZSdyZSBiZXNpZGUgd2Via2l0Y29yZXB5 LCBvdGhlcndpc2UgaXQgd2lsbCBuZWVkIHRvIGJlIGluc3RhbGxlZAorY29udGFpbmluZyA9IG9z LnBhdGguZGlybmFtZShvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGly bmFtZShfX2ZpbGVfXykpKSkKK3BhdGhfYWRkaXRpb24gPSBvcy5wYXRoLmpvaW4oY29udGFpbmlu ZywgJ3dlYmtpdGNvcmVweScpCitpZiBvcy5wYXRoLmlzZGlyKHBhdGhfYWRkaXRpb24pIGFuZCBv cy5wYXRoLmlzZGlyKG9zLnBhdGguam9pbihwYXRoX2FkZGl0aW9uLCAnd2Via2l0Y29yZXB5Jykp IGFuZCBwYXRoX2FkZGl0aW9uIG5vdCBpbiBzeXMucGF0aDoKKyAgICBzeXMucGF0aC5pbnNlcnQo MCwgcGF0aF9hZGRpdGlvbikKKworZnJvbSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVy c2lvbgordmVyc2lvbiA9IFZlcnNpb24oMSwgMCwgMCkKKwogbmFtZSA9ICdyZXN1bHRzZGJweScK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkJ KHJldmlzaW9uIDI2NTcyNykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVw eS9zZXR1cC5weQkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsNyBAQCBzZXR1cCgKICAgICBp bnN0YWxsX3JlcXVpcmVzPVsKICAgICAgICAgJ21vY2snLAogICAgICAgICAncmVxdWVzdHMnLAor ICAgICAgICAnc2l4JywKICAgICBdLAogICAgIGluY2x1ZGVfcGFja2FnZV9kYXRhPVRydWUsCiAg ICAgemlwX3NhZmU9RmFsc2UsCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHJldmlz aW9uIDI2NTcyNykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJr aXRjb3JlcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTMyLDcgKzMyLDcgQEAgbG9n LmFkZEhhbmRsZXIoTnVsbEhhbmRsZXIoKSkKIGZyb20gd2Via2l0Y29yZXB5LnZlcnNpb24gaW1w b3J0IFZlcnNpb24KIGZyb20gd2Via2l0Y29yZXB5LnN0cmluZ191dGlscyBpbXBvcnQgQnl0ZXNJ TywgU3RyaW5nSU8sIFVuaWNvZGVJTywgdW5pY29kZQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAy LCAzKQordmVyc2lvbiA9IFZlcnNpb24oMCwgMiwgNCkKIAogZnJvbSB3ZWJraXRjb3JlcHkuYXV0 b2luc3RhbGwgaW1wb3J0IFBhY2thZ2UsIEF1dG9JbnN0YWxsCiBpZiBzeXMudmVyc2lvbl9pbmZv ID4gKDMsIDApOgpAQCAtNTMsMyArNTMsNSBAQCBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdzZXR1cHRvb2xzCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdzb2NrcycsIFZlcnNp b24oMSwgNywgMSksIHB5cGlfbmFtZT0nUHlTb2NrcycpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIo UGFja2FnZSgnc2l4JywgVmVyc2lvbigxLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIo UGFja2FnZSgndXJsbGliMycsIFZlcnNpb24oMSwgMjUsIDEwKSkpCisKK25hbWUgPSAnd2Via2l0 Y29yZXB5Jwo= 406729 2020-08-17 12:21:45 -0700 2020-08-17 13:26:33 -0700 Patch bug-215573-20200817122144.patch text/plain 5014 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTc1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTA4LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0c2RicHldOiBEZXBlbmQgb24gd2Via2l0Y29yZXB5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU1NzMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3MjUwMjcyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvX19pbml0X18ucHk6CisgICAgICAgIChfbWF5YmVfYWRkX3dlYmtpdGNvcmVweV9w YXRoKTogQXR0ZW1wdCB0byBhZGQuIHdlYmtpdGNvcmVweSB0byB0aGUuIFB5dGhvbiBwYXRoLgor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVwLnB5OiBBZGQgd2Vi a2l0Y29yZXB5LCByZW1vdmUgd2Via2l0Y29yZXB5J3MgZGVwZW5kZW5jaWVzLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weTogQWRkIHNpeCBhcyBhIGRl cGVuZGVuY3kuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9fX2luaXRfXy5weTogSW5jbHVkZS4gcGFja2FnZSBuYW1lLCBidW1wIHZlcnNpb24u CisKIDIwMjAtMDgtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdW1dQRV0gUmVtb3ZlIHN1cHBvcnQgZm9yIE5QQVBJIHBsdWdpbnMK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVwLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVwLnB5CShy ZXZpc2lvbiAyNjU3MjcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9z ZXR1cC5weQkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAy MDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE5 LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMg bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCkBAIC0yMCw2ICsyMCw3IEBACiAjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAKK2Zyb20gcmVzdWx0c2RicHkgaW1wb3J0IHZlcnNpb24KIGZyb20gc2V0dXB0 b29scyBpbXBvcnQgc2V0dXAKIAogCkBAIC0zMCw3ICszMSw3IEBAIGRlZiByZWFkbWUoKToKIAog c2V0dXAoCiAgICAgbmFtZT0ncmVzdWx0c2RicHknLAotICAgIHZlcnNpb249JzAuOS4wJywKKyAg ICB2ZXJzaW9uPXN0cih2ZXJzaW9uKSwKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBmb3Igdmlz dWFsaXppbmcsIHByb2Nlc3NpbmcgYW5kIHN0b3JpbmcgdGVzdCByZXN1bHRzLicsCiAgICAgbG9u Z19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkBAIC01NywxMiArNTgs MTAgQEAgc2V0dXAoCiAgICAgICAgICdGbGFzay1Db3JzJywKICAgICAgICAgJ2d1bmljb3JuJywK ICAgICAgICAgJ2x1cGEnLAotICAgICAgICAnbW9jaycsCiAgICAgICAgICdyZWRpcycsCiAgICAg ICAgICd4bWx0b2RpY3QnLAotICAgICAgICAncmVxdWVzdHMnLAogICAgICAgICAnc2VsZW5pdW0n LAotICAgICAgICAnc2l4JywKKyAgICAgICAgJ3dlYmtpdGNvcmVweScsCiAgICAgXSwKICAgICBp bmNsdWRlX3BhY2thZ2VfZGF0YT1UcnVlLAogICAgIHppcF9zYWZlPUZhbHNlLApJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvX19pbml0X18ucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0 c2RicHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NTcyNykKKysrIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkp CkBAIC0yMCw0ICsyMCwyOSBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogCitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKKworCitkZWYgX21heWJlX2FkZF93ZWJraXRjb3Jl cHlfcGF0aCgpOgorICAgICMgSG9wZWZ1bGx5IHdlJ3JlIGJlc2lkZSB3ZWJraXRjb3JlcHksIG90 aGVyd2lzZSB3ZWJraXRjb3JlcHkgd2lsbCBuZWVkIHRvIGJlIGluc3RhbGxlZC4KKyAgICBsaWJy YXJpZXNfcGF0aCA9IG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNw YXRoKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXykpKSkKKyAgICB3ZWJraXRjb3JlcHlfcGF0aCA9 IG9zLnBhdGguam9pbihsaWJyYXJpZXNfcGF0aCwgJ3dlYmtpdGNvcmVweScpCisgICAgaWYgb3Mu cGF0aC5pc2Rpcih3ZWJraXRjb3JlcHlfcGF0aCkgYW5kIG9zLnBhdGguaXNkaXIob3MucGF0aC5q b2luKHdlYmtpdGNvcmVweV9wYXRoLCAnd2Via2l0Y29yZXB5JykpIGFuZCB3ZWJraXRjb3JlcHlf cGF0aCBub3QgaW4gc3lzLnBhdGg6CisgICAgICAgIHN5cy5wYXRoLmluc2VydCgwLCB3ZWJraXRj b3JlcHlfcGF0aCkKKworCitfbWF5YmVfYWRkX3dlYmtpdGNvcmVweV9wYXRoKCkKKwordHJ5Ogor ICAgIGZyb20gd2Via2l0Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KK2V4Y2VwdCBJbXBv cnRFcnJvcjoKKyAgICByYWlzZSBJbXBvcnRFcnJvcigKKyAgICAgICAgIid3ZWJraXRjb3JlcHkn IGNvdWxkIG5vdCBiZSBmb3VuZCBvbiB5b3VyIFB5dGhvbiBwYXRoLlxuIiArCisgICAgICAgICJZ b3UgYXJlIG5vdCBydW5uaW5nIGZyb20gYSBXZWJLaXQgY2hlY2tvdXQuXG4iICsKKyAgICAgICAg IlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3Jl cHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCisgICAgKQorCit2ZXJz aW9uID0gVmVyc2lvbigxLCAwLCAwKQorCiBuYW1lID0gJ3Jlc3VsdHNkYnB5JwpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQkocmV2aXNpb24g MjY1NzI3KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1Miw3IEBAIHNldHVwKAogICAgIGluc3RhbGxfcmVx dWlyZXM9WwogICAgICAgICAnbW9jaycsCiAgICAgICAgICdyZXF1ZXN0cycsCisgICAgICAgICdz aXgnLAogICAgIF0sCiAgICAgaW5jbHVkZV9wYWNrYWdlX2RhdGE9VHJ1ZSwKICAgICB6aXBfc2Fm ZT1GYWxzZSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJr aXRjb3JlcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY1NzI3 KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9f X2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCBsb2cuYWRkSGFuZGxl cihOdWxsSGFuZGxlcigpKQogZnJvbSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lv bgogZnJvbSB3ZWJraXRjb3JlcHkuc3RyaW5nX3V0aWxzIGltcG9ydCBCeXRlc0lPLCBTdHJpbmdJ TywgVW5pY29kZUlPLCB1bmljb2RlCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDIsIDMpCit2ZXJz aW9uID0gVmVyc2lvbigwLCAyLCA0KQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBp bXBvcnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6 CkBAIC01MywzICs1Myw1IEBAIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NldHVwdG9v bHMKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NvY2tzJywgVmVyc2lvbigxLCA3LCAx KSwgcHlwaV9uYW1lPSdQeVNvY2tzJykpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdz aXgnLCBWZXJzaW9uKDEsIDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCd1 cmxsaWIzJywgVmVyc2lvbigxLCAyNSwgMTApKSkKKworbmFtZSA9ICd3ZWJraXRjb3JlcHknCg== 406740 2020-08-17 13:26:35 -0700 2020-08-17 13:53:25 -0700 Patch for landing bug-215573-20200817132634.patch text/plain 5064 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTc2OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTA4LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0c2RicHldOiBEZXBlbmQgb24gd2Via2l0Y29yZXB5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU1NzMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3MjUwMjcyPgorCisgICAgICAgIFJldmlld2VkIGJ5IERld2Vp IFpodS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L19faW5pdF9fLnB5OgorICAgICAgICAoX21heWJlX2FkZF93ZWJraXRjb3JlcHlfcGF0aCk6 IEF0dGVtcHQgdG8gYWRkLiB3ZWJraXRjb3JlcHkgdG8gdGhlLiBQeXRob24gcGF0aC4KKyAgICAg ICAgKiBTY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9zZXR1cC5weTogQWRkIHdlYmtpdGNv cmVweSwgcmVtb3ZlIHdlYmtpdGNvcmVweSdzIGRlcGVuZGVuY2llcy4KKyAgICAgICAgKiBTY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHk6IEFkZCBzaXggYXMgYSBkZXBlbmRl bmN5LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvX19pbml0X18ucHk6IEluY2x1ZGUuIHBhY2thZ2UgbmFtZSwgYnVtcCB2ZXJzaW9uLgorCiAy MDIwLTA4LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAg ICBbd2Via2l0Y29yZXB5XSBBZGQgT3V0cHV0Q2FwdHVyZSB0byB3ZWJraXRjb3JlcHkKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVwLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVwLnB5CShyZXZpc2lv biAyNjU3NjkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9zZXR1cC5w eQkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDE5IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE5LTIwMjAg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0yMCw2ICsyMCw3IEBACiAjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAKK2Zyb20gcmVzdWx0c2RicHkgaW1wb3J0IHZlcnNpb24KIGZyb20gc2V0dXB0b29scyBp bXBvcnQgc2V0dXAKIAogCkBAIC0zMCw3ICszMSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAo CiAgICAgbmFtZT0ncmVzdWx0c2RicHknLAotICAgIHZlcnNpb249JzAuOS4wJywKKyAgICB2ZXJz aW9uPXN0cih2ZXJzaW9uKSwKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBmb3IgdmlzdWFsaXpp bmcsIHByb2Nlc3NpbmcgYW5kIHN0b3JpbmcgdGVzdCByZXN1bHRzLicsCiAgICAgbG9uZ19kZXNj cmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkBAIC01NywxMiArNTgsMTAgQEAg c2V0dXAoCiAgICAgICAgICdGbGFzay1Db3JzJywKICAgICAgICAgJ2d1bmljb3JuJywKICAgICAg ICAgJ2x1cGEnLAotICAgICAgICAnbW9jaycsCiAgICAgICAgICdyZWRpcycsCiAgICAgICAgICd4 bWx0b2RpY3QnLAotICAgICAgICAncmVxdWVzdHMnLAogICAgICAgICAnc2VsZW5pdW0nLAotICAg ICAgICAnc2l4JywKKyAgICAgICAgJ3dlYmtpdGNvcmVweScsCiAgICAgXSwKICAgICBpbmNsdWRl X3BhY2thZ2VfZGF0YT1UcnVlLAogICAgIHppcF9zYWZlPUZhbHNlLApJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvX19pbml0X18ucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv X19pbml0X18ucHkJKHJldmlzaW9uIDI2NTc2OSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y MCw0ICsyMCwyOSBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCitp bXBvcnQgb3MKK2ltcG9ydCBzeXMKKworCitkZWYgX21heWJlX2FkZF93ZWJraXRjb3JlcHlfcGF0 aCgpOgorICAgICMgSG9wZWZ1bGx5IHdlJ3JlIGJlc2lkZSB3ZWJraXRjb3JlcHksIG90aGVyd2lz ZSB3ZWJraXRjb3JlcHkgd2lsbCBuZWVkIHRvIGJlIGluc3RhbGxlZC4KKyAgICBsaWJyYXJpZXNf cGF0aCA9IG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNwYXRoKG9z LnBhdGguZGlybmFtZShfX2ZpbGVfXykpKSkKKyAgICB3ZWJraXRjb3JlcHlfcGF0aCA9IG9zLnBh dGguam9pbihsaWJyYXJpZXNfcGF0aCwgJ3dlYmtpdGNvcmVweScpCisgICAgaWYgb3MucGF0aC5p c2Rpcih3ZWJraXRjb3JlcHlfcGF0aCkgYW5kIG9zLnBhdGguaXNkaXIob3MucGF0aC5qb2luKHdl YmtpdGNvcmVweV9wYXRoLCAnd2Via2l0Y29yZXB5JykpIGFuZCB3ZWJraXRjb3JlcHlfcGF0aCBu b3QgaW4gc3lzLnBhdGg6CisgICAgICAgIHN5cy5wYXRoLmluc2VydCgwLCB3ZWJraXRjb3JlcHlf cGF0aCkKKworCitfbWF5YmVfYWRkX3dlYmtpdGNvcmVweV9wYXRoKCkKKwordHJ5OgorICAgIGZy b20gd2Via2l0Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KK2V4Y2VwdCBJbXBvcnRFcnJv cjoKKyAgICByYWlzZSBJbXBvcnRFcnJvcigKKyAgICAgICAgIid3ZWJraXRjb3JlcHknIGNvdWxk IG5vdCBiZSBmb3VuZCBvbiB5b3VyIFB5dGhvbiBwYXRoLlxuIiArCisgICAgICAgICJZb3UgYXJl IG5vdCBydW5uaW5nIGZyb20gYSBXZWJLaXQgY2hlY2tvdXQuXG4iICsKKyAgICAgICAgIlBsZWFz ZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1l eHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCisgICAgKQorCit2ZXJzaW9uID0g VmVyc2lvbigxLCAwLCAwKQorCiBuYW1lID0gJ3Jlc3VsdHNkYnB5JwpJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQkocmV2aXNpb24gMjY1NzY5 KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC01Miw2ICs1Miw3IEBAIHNldHVwKAogICAgIGluc3RhbGxfcmVxdWlyZXM9 WwogICAgICAgICAnbW9jaycsCiAgICAgICAgICdyZXF1ZXN0cycsCisgICAgICAgICdzaXgnLAog ICAgIF0sCiAgICAgaW5jbHVkZV9wYWNrYWdlX2RhdGE9VHJ1ZSwKICAgICB6aXBfc2FmZT1GYWxz ZSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY1NzY5KQorKysg VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRf Xy5weQkod29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsNyBAQCBmcm9tIHdlYmtpdGNvcmVweS52 ZXJzaW9uIGltcG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMgaW1w b3J0IEJ5dGVzSU8sIFN0cmluZ0lPLCBVbmljb2RlSU8sIHVuaWNvZGUKIGZyb20gd2Via2l0Y29y ZXB5Lm91dHB1dF9jYXB0dXJlIGltcG9ydCBMb2dnZXJDYXB0dXJlLCBPdXRwdXRDYXB0dXJlLCBP dXRwdXREdXBsaWNhdGUKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgMiwgNSkKK3ZlcnNpb24gPSBW ZXJzaW9uKDAsIDIsIDYpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQ YWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKQEAgLTU0 LDMgKzU0LDUgQEAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2V0dXB0b29scwogQXV0 b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc29ja3MnLCBWZXJzaW9uKDEsIDcsIDEpLCBweXBp X25hbWU9J1B5U29ja3MnKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NpeCcsIFZl cnNpb24oMSwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3VybGxpYjMn LCBWZXJzaW9uKDEsIDI1LCAxMCkpKQorCituYW1lID0gJ3dlYmtpdGNvcmVweScK