206856 2020-01-27 17:16:23 -0800 Python 3: Update windows scripts and uses of is constant 2020-01-28 09:02:15 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 stephan.szabo webkit-unassigned commit-queue ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1611726 0 stephan.szabo 2020-01-27 17:16:23 -0800 The requirements download script used for wincairo was having problems on python 3. While working with that, hit error in port/win.py when trying to run check-webkit-style on windows with python 3 and a few more cases that used "is <constant>" that now give SyntaxWarnings. 1611727 1 388946 stephan.szabo 2020-01-27 17:19:49 -0800 Created attachment 388946 Patch 1611743 2 388946 jbedard 2020-01-27 17:40:54 -0800 Comment on attachment 388946 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388946&action=review > Tools/Scripts/download-github-release.py:-30 > -import urllib2 We clearly don't have test coverage here. Do you know who uses this script? > Tools/Scripts/webkitpy/common/system/profiler.py:175 > + if exit_code != 0: What sort of linter are you running to find these? Is that a Python 3.8 thing? If so, would you mind run 'test-webkitpy-python3' and fixing everything it flags in a separate patch? 1611758 3 stephan.szabo 2020-01-27 17:53:22 -0800 (In reply to Jonathan Bedard from comment #2) > Comment on attachment 388946 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=388946&action=review > > > Tools/Scripts/download-github-release.py:-30 > > -import urllib2 > > We clearly don't have test coverage here. Do you know who uses this script? Wincairo's update-webkit-wincairo-libs.py script is the only current user. > > Tools/Scripts/webkitpy/common/system/profiler.py:175 > > + if exit_code != 0: > > What sort of linter are you running to find these? Is that a Python 3.8 > thing? I think it's a syntax warning (on loading the file?) that was added in 3.8. > If so, would you mind run 'test-webkitpy-python3' and fixing everything it > flags in a separate patch? test-webkitpy-python3 was how I hit most of the "is XXX" ones in this patch. I didn't cover anything that was in thirdparty, but I think I hit all the ones apart from that, but I'll check to see if I missed anything. 1611927 4 jbedard 2020-01-28 08:18:09 -0800 (In reply to Stephan Szabo from comment #3) > (In reply to Jonathan Bedard from comment #2) > > Comment on attachment 388946 [details] > > Patch > > > > ... > > > > What sort of linter are you running to find these? Is that a Python 3.8 > > thing? > > I think it's a syntax warning (on loading the file?) that was added in 3.8. > > > If so, would you mind run 'test-webkitpy-python3' and fixing everything it > > flags in a separate patch? > > test-webkitpy-python3 was how I hit most of the "is XXX" ones in this patch. > I didn't cover anything that was in thirdparty, but I think I hit all the > ones apart from that, but I'll check to see if I missed anything. Surprised that there are so few! We might eventually need to update third party libraries to ones that advertise themselves as 3.8 compatible, but that's not an urgent task. 1611963 5 388946 commit-queue 2020-01-28 09:01:57 -0800 Comment on attachment 388946 Patch Clearing flags on attachment: 388946 Committed r255243: <https://trac.webkit.org/changeset/255243> 1611964 6 commit-queue 2020-01-28 09:01:58 -0800 All reviewed patches have been landed. Closing bug. 1611965 7 webkit-bug-importer 2020-01-28 09:02:15 -0800 <rdar://problem/58957042> 388946 2020-01-27 17:19:49 -0800 2020-01-28 09:01:57 -0800 Patch 206856.1.diff text/plain 9229 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmNWM3 YWEyMjg4ZC4uYzI3NzgyNDg3YWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wMS0yNyAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CisKKyAgICAgICAgUHl0aG9uIDM6IFVwZGF0ZSB3 aW5kb3dzIHNjcmlwdHMgYW5kIHVzZXMgb2YgaXMgY29uc3RhbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjg1NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9kb3dubG9hZC1naXRodWIt cmVsZWFzZS5weTogVXBkYXRlIGZvciBweXRob24gMworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9wcm9maWxlci5weTogQ2hhbmdlIGlzIGNvbnN0YW50IHVzYWdlCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0 X3Rlc3RfZmluZGVyLnB5OiBDaGFuZ2UgaXMgY29uc3RhbnQgdXNhZ2UKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1 bHRzX2dlbmVyYXRvci5weTogQ2hhbmdlIGlzIGNvbnN0YW50IHVzYWdlCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9wb3J0L3dlc3RvbmRyaXZlci5weTogQ2hhbmdlIGlzIGNvbnN0YW50IHVz YWdlCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weTogVXBkYXRlIGZvciBw eXRob24gMworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC94dmZiZHJpdmVyLnB5OiBD aGFuZ2UgaXMgY29uc3RhbnQgdXNhZ2UKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hjb2Rl L2RldmljZV90eXBlLnB5OiBDaGFuZ2UgaXMgY29uc3RhbnQgdXNhZ2UKKwogMjAyMC0wMS0yNyAg Um9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29tPgogCiAgICAgICAgIFRvb2xzL1Nj cmlwdHMvc2V0LXdlYmtpdC1jb25maWd1cmF0aW9uIHNob3VsZCBhY2NlcHQgLS1jb3ZlcmFnZS8t LW5vLWNvdmVyYWdlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2Rvd25sb2FkLWdpdGh1Yi1y ZWxlYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy9kb3dubG9hZC1naXRodWItcmVsZWFzZS5weQppbmRl eCA5MWFiOGY4MWJkZS4uMDQzZGMyNjZiMjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvZG93 bmxvYWQtZ2l0aHViLXJlbGVhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9kb3dubG9hZC1naXRo dWItcmVsZWFzZS5weQpAQCAtMjcsNyArMjcsMTIgQEAgaW1wb3J0IGFyZ3BhcnNlCiBpbXBvcnQg anNvbgogaW1wb3J0IG9zCiBpbXBvcnQgc3lzCi1pbXBvcnQgdXJsbGliMgorCit0cnk6CisgICAg ZnJvbSB1cmxsaWIucmVxdWVzdCBpbXBvcnQgdXJsb3BlbiwgUmVxdWVzdAorICAgIGZyb20gdXJs bGliLmVycm9yIGltcG9ydCBVUkxFcnJvcgorZXhjZXB0IEltcG9ydEVycm9yOgorICAgIGZyb20g dXJsbGliMiBpbXBvcnQgdXJsb3BlbiwgUmVxdWVzdCwgVVJMRXJyb3IKIAogUFVCTElDX0dJVEhV Ql9BUElfRU5EUE9JTlQgPSAnaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS8nCiAKQEAgLTY1LDE0ICs3 MCwxNCBAQCBkZWYgZmluZF9yZWxlYXNlKGVuZHBvaW50LCByZXBvLCBmaWxlbmFtZSwgdG9rZW4s IHRhZyk6CiAgICAgcmVsZWFzZV9uYW1lID0gJ3RhZ3Mve30nLmZvcm1hdCh0YWcpIGlmIHRhZyBl bHNlICdsYXRlc3QnCiAgICAgdXJsID0gJ3t9L3JlcG9zL3t9L3JlbGVhc2VzL3t9Jy5mb3JtYXQo ZW5kcG9pbnQucnN0cmlwKCcvJyksIHJlcG8sIHJlbGVhc2VfbmFtZSkKIAotICAgIHJlcXVlc3Qg PSB1cmxsaWIyLlJlcXVlc3QodXJsKQorICAgIHJlcXVlc3QgPSBSZXF1ZXN0KHVybCkKICAgICBy ZXF1ZXN0LmFkZF9oZWFkZXIoJ0FjY2VwdCcsICdhcHBsaWNhdGlvbi92bmQuZ2l0aHViLnYzK2pz b24nKQogICAgIGlmIHRva2VuOgogICAgICAgICByZXF1ZXN0LmFkZF9oZWFkZXIoJ0F1dGhvcml6 YXRpb24nLCAndG9rZW4ge30nLmZvcm1hdCh0b2tlbikpCiAKICAgICB0cnk6Ci0gICAgICAgIHJl c3BvbnNlID0gdXJsbGliMi51cmxvcGVuKHJlcXVlc3QpCi0gICAgZXhjZXB0IHVybGxpYjIuVVJM RXJyb3IgYXMgZXJyb3I6CisgICAgICAgIHJlc3BvbnNlID0gdXJsb3BlbihyZXF1ZXN0KQorICAg IGV4Y2VwdCBVUkxFcnJvciBhcyBlcnJvcjoKICAgICAgICAgcHJpbnQoZXJyb3IpCiAgICAgICAg IHJldHVybiBOb25lLCBOb25lCiAKQEAgLTg1LDEzICs5MCwxMyBAQCBkZWYgZmluZF9yZWxlYXNl KGVuZHBvaW50LCByZXBvLCBmaWxlbmFtZSwgdG9rZW4sIHRhZyk6CiAKIAogZGVmIGRvd25sb2Fk X3JlbGVhc2Uoc291cmNlX3VybCwgdGFyZ2V0X3BhdGgsIHRva2VuKToKLSAgICByZXF1ZXN0ID0g dXJsbGliMi5SZXF1ZXN0KHNvdXJjZV91cmwpCisgICAgcmVxdWVzdCA9IFJlcXVlc3Qoc291cmNl X3VybCkKICAgICByZXF1ZXN0LmFkZF9oZWFkZXIoJ0FjY2VwdCcsICdhcHBsaWNhdGlvbi9vY3Rl dC1zdHJlYW0nKQogICAgIGlmIHRva2VuOgogICAgICAgICByZXF1ZXN0LmFkZF9oZWFkZXIoJ0F1 dGhvcml6YXRpb24nLCAndG9rZW4ge30nLmZvcm1hdCh0b2tlbikpCiAKICAgICB3aXRoIG9wZW4o dGFyZ2V0X3BhdGgsICd3YicpIGFzIGZpbGU6Ci0gICAgICAgIGZpbGUud3JpdGUodXJsbGliMi51 cmxvcGVuKHJlcXVlc3QpLnJlYWQoKSkKKyAgICAgICAgZmlsZS53cml0ZSh1cmxvcGVuKHJlcXVl c3QpLnJlYWQoKSkKIAogCiBkZWYgbG9hZF92ZXJzaW9uX2luZm8odmVyc2lvbl9pbmZvX3BhdGgp OgpAQCAtMTEzLDE2ICsxMTgsMTYgQEAgZGVmIG1haW4oYXJndik6CiAgICAgYmluYXJ5X3BhdGgg PSBvcy5wYXRoLmpvaW4oYXJncy5vdXRwdXRfZGlyLCBhcmdzLmZpbGVuYW1lKQogICAgIHZlcnNp b25faW5mb19wYXRoID0gYmluYXJ5X3BhdGggKyAnLnZlcnNpb24nCiAKLSAgICBwcmludCgnVXBk YXRpbmcge30uLi4nLmZvcm1hdChhcmdzLmZpbGVuYW1lKSkKKyAgICBwcmludCgoJ1VwZGF0aW5n IHt9Li4uJy5mb3JtYXQoYXJncy5maWxlbmFtZSkpKQogCiAgICAgZXhpc3RpbmdfdmVyc2lvbl9p bmZvID0gbG9hZF92ZXJzaW9uX2luZm8odmVyc2lvbl9pbmZvX3BhdGgpCiAgICAgaWYgZXhpc3Rp bmdfdmVyc2lvbl9pbmZvOgotICAgICAgICBwcmludCgnRm91bmQgZXhpc3RpbmcgcmVsZWFzZTog e30nLmZvcm1hdChleGlzdGluZ192ZXJzaW9uX2luZm9bJ3RhZ19uYW1lJ10pKQorICAgICAgICBw cmludCgoJ0ZvdW5kIGV4aXN0aW5nIHJlbGVhc2U6IHt9Jy5mb3JtYXQoZXhpc3RpbmdfdmVyc2lv bl9pbmZvWyd0YWdfbmFtZSddKSkpCiAgICAgZWxzZToKICAgICAgICAgcHJpbnQoJ05vIGV4aXN0 aW5nIHJlbGVhc2UgZm91bmQuJykKIAogICAgIHJlbGVhc2VfdGl0bGUgPSAncmVsZWFzZSAie30i Jy5mb3JtYXQoYXJncy5yZWxlYXNlX3RhZykgaWYgYXJncy5yZWxlYXNlX3RhZyBlbHNlICdsYXRl c3QgcmVsZWFzZScKLSAgICBwcmludCgnU2Vla2luZyB7fSBmcm9tIHt9Li4uJy5mb3JtYXQocmVs ZWFzZV90aXRsZSwgYXJncy5yZXBvKSkKKyAgICBwcmludCgoJ1NlZWtpbmcge30gZnJvbSB7fS4u LicuZm9ybWF0KHJlbGVhc2VfdGl0bGUsIGFyZ3MucmVwbykpKQogICAgIHJlbGVhc2VfdXJsLCB0 YXJnZXRfdmVyc2lvbl9pbmZvID0gZmluZF9yZWxlYXNlKGFyZ3MuZW5kcG9pbnQsIGFyZ3MucmVw bywgYXJncy5maWxlbmFtZSwgYXJncy50b2tlbiwgYXJncy5yZWxlYXNlX3RhZykKIAogICAgIGlm IG5vdCB0YXJnZXRfdmVyc2lvbl9pbmZvOgpAQCAtMTQyLDcgKzE0Nyw3IEBAIGRlZiBtYWluKGFy Z3YpOgogICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhhcmdzLm91dHB1dF9kaXIpOgogICAgICAg ICBvcy5tYWtlZGlycyhhcmdzLm91dHB1dF9kaXIpCiAKLSAgICBwcmludCgnRG93bmxvYWRpbmcg dG8ge30uLi4nLmZvcm1hdChvcy5wYXRoLmFic3BhdGgoYXJncy5vdXRwdXRfZGlyKSkpCisgICAg cHJpbnQoKCdEb3dubG9hZGluZyB0byB7fS4uLicuZm9ybWF0KG9zLnBhdGguYWJzcGF0aChhcmdz Lm91dHB1dF9kaXIpKSkpCiAgICAgZG93bmxvYWRfcmVsZWFzZShyZWxlYXNlX3VybCwgYmluYXJ5 X3BhdGgsIGFyZ3MudG9rZW4pCiAgICAgc2F2ZV92ZXJzaW9uX2luZm8odmVyc2lvbl9pbmZvX3Bh dGgsIHRhcmdldF92ZXJzaW9uX2luZm8pCiAgICAgcHJpbnQoJ0RvbmUhJykKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxlci5weQppbmRleCAzNTMyYzFm ZjgyMS4uYTllNDEzZmYzODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9wcm9maWxlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcHJvZmlsZXIucHkKQEAgLTE3Miw3ICsxNzIsNyBAQCBjbGFzcyBQZXJmKFNpbmds ZUZpbGVPdXRwdXRQcm9maWxlcik6CiAKICAgICAgICAgIyBSZXR1cm4gZWFybHkgaWYgdGhlIHBy b2Nlc3MgcHJvZHVjZWQgbm9uLXplcm8gZXhpdCBjb2RlIG9yIGlzIHN0aWxsIHJ1bm5pbmcgKGlm IGl0IGNvdWxkbid0IGJlIGtpbGxlZCkuCiAgICAgICAgIGV4aXRfY29kZSA9IHNlbGYuX3dhaXRf cHJvY2Vzcy5wb2xsKCkKLSAgICAgICAgaWYgZXhpdF9jb2RlIGlzIG5vdCAwOgorICAgICAgICBp ZiBleGl0X2NvZGUgIT0gMDoKICAgICAgICAgICAgIHByaW50KCIncGVyZiByZWNvcmQnIGZhaWxl ZCwgIiwgZW5kPScgJykKICAgICAgICAgICAgIGlmIGV4aXRfY29kZToKICAgICAgICAgICAgICAg ICBwcmludCgiZXhpdCBjb2RlIHdhcyAlaS4iICUgZXhpdF9jb2RlKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3Rf ZmluZGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbGF5b3V0X3Rlc3RfZmluZGVyLnB5CmluZGV4IDg2ZjIzYzNmMGIxLi44NTRkYjQ5OWNhZCAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbGF5b3V0X3Rlc3RfZmluZGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X2ZpbmRlci5weQpAQCAtMTA5LDcgKzEw OSw3IEBAIGNsYXNzIExheW91dFRlc3RGaW5kZXIob2JqZWN0KToKICAgICBAc3RhdGljbWV0aG9k CiAgICAgZGVmIF9zdHJpcF9jb21tZW50cyhsaW5lKToKICAgICAgICAgY29tbWVudEluZGV4ID0g bGluZS5maW5kKCcvLycpCi0gICAgICAgIGlmIGNvbW1lbnRJbmRleCBpcyAtMToKKyAgICAgICAg aWYgY29tbWVudEluZGV4ID09IC0xOgogICAgICAgICAgICAgY29tbWVudEluZGV4ID0gbGVuKGxp bmUpCiAKICAgICAgICAgbGluZSA9IHJlLnN1YihyJ1xzKycsICcgJywgbGluZVs6Y29tbWVudElu ZGV4XS5zdHJpcCgpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3IucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xh eW91dF9yZXN1bHRzX2dlbmVyYXRvci5weQppbmRleCA2NGYxMWI5MmY0OS4uOWI5M2JlMmEzZDUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3Vs dHNfZ2VuZXJhdG9yLnB5CkBAIC04MiwxMCArODIsMTAgQEAgY2xhc3MgSlNPTkxheW91dFJlc3Vs dHNHZW5lcmF0b3IoanNvbl9yZXN1bHRzX2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVyYXRvcik6 CiAgICAgICAgICAgZmFzdC9mb3Jtcy9mb28uaHRtbAogICAgICAgICAiIiIKICAgICAgICAgaW5k ZXggPSB0ZXN0LmZpbmQoc2VsZi5MQVlPVVRfVEVTVFNfUEFUSCkKLSAgICAgICAgaWYgaW5kZXgg aXMgbm90IC0xOgorICAgICAgICBpZiBpbmRleCAhPSAtMToKICAgICAgICAgICAgIGluZGV4ICs9 IGxlbihzZWxmLkxBWU9VVF9URVNUU19QQVRIKQogCi0gICAgICAgIGlmIGluZGV4IGlzIC0xOgor ICAgICAgICBpZiBpbmRleCA9PSAtMToKICAgICAgICAgICAgICMgQWxyZWFkeSBhIHJlbGF0aXZl IHBhdGguCiAgICAgICAgICAgICByZWxhdGl2ZVBhdGggPSB0ZXN0CiAgICAgICAgIGVsc2U6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2VzdG9uZHJpdmVyLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dlc3RvbmRyaXZlci5weQppbmRleCBjMzRjZGQ1 MGRkYi4uYTZhNWFiMzI5ODMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC93ZXN0b25kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dlc3Rv bmRyaXZlci5weQpAQCAtNDQsNyArNDQsNyBAQCBjbGFzcyBXZXN0b25Ecml2ZXIoRHJpdmVyKToK ICAgICAgICAgd2VzdG9uX2ZpbmRjbWQgPSBbJ3doaWNoJywgJ3dlc3RvbiddCiAgICAgICAgIGlm IHBvcnQuX3Nob3VsZF91c2VfamhidWlsZCgpOgogICAgICAgICAgICAgd2VzdG9uX2ZpbmRjbWQg PSBwb3J0Ll9qaGJ1aWxkX3dyYXBwZXIgKyB3ZXN0b25fZmluZGNtZAotICAgICAgICB3ZXN0b25f Zm91bmQgPSBwb3J0Lmhvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKHdlc3Rvbl9maW5kY21kLCBy ZXR1cm5fZXhpdF9jb2RlPVRydWUpIGlzIDAKKyAgICAgICAgd2VzdG9uX2ZvdW5kID0gcG9ydC5o b3N0LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZCh3ZXN0b25fZmluZGNtZCwgcmV0dXJuX2V4aXRfY29k ZT1UcnVlKSA9PSAwCiAgICAgICAgIGlmIG5vdCB3ZXN0b25fZm91bmQ6CiAgICAgICAgICAgICBf bG9nLmVycm9yKCJObyB3ZXN0b24gZm91bmQuIENhbm5vdCBydW4gbGF5b3V0IHRlc3RzLiIpCiAg ICAgICAgIHJldHVybiB3ZXN0b25fZm91bmQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC93aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5Cmlu ZGV4IDY2OTgyYmVjZGRmLi40OGM5YjEyMjhkMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L3dpbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2lu LnB5CkBAIC01MSw3ICs1MSwxMSBAQCB0cnk6CiAgICAgaW1wb3J0IF93aW5yZWcKICAgICBpbXBv cnQgd2luMzJjb20uY2xpZW50CiBleGNlcHQgSW1wb3J0RXJyb3I6Ci0gICAgX2xvZy5kZWJ1Zygi Tm90IHJ1bm5pbmcgb24gbmF0aXZlIFdpbmRvd3MuIikKKyAgICB0cnk6CisgICAgICAgIGltcG9y dCB3aW5yZWcgYXMgX3dpbnJlZworICAgICAgICBpbXBvcnQgd2luMzJjb20uY2xpZW50CisgICAg ZXhjZXB0IEltcG9ydEVycm9yOgorICAgICAgICBfbG9nLmRlYnVnKCJOb3QgcnVubmluZyBvbiBu YXRpdmUgV2luZG93cy4iKQogCiAKIGNsYXNzIFdpblBvcnQoQXBwbGVQb3J0KToKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC94dmZiZHJpdmVyLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L3h2ZmJkcml2ZXIucHkKaW5kZXggYWJlYWE1MWNkOWMuLjVhNmZh MWNkNDUyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQveHZmYmRyaXZl ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQveHZmYmRyaXZlci5weQpAQCAt NDQsNyArNDQsNyBAQCBjbGFzcyBYdmZiRHJpdmVyKERyaXZlcik6CiAgICAgICAgIHh2ZmJfZmlu ZGNtZCA9IFsnd2hpY2gnLCAnWHZmYiddCiAgICAgICAgIGlmIHBvcnQuX3Nob3VsZF91c2Vfamhi dWlsZCgpOgogICAgICAgICAgICAgICAgIHh2ZmJfZmluZGNtZCA9IHBvcnQuX2poYnVpbGRfd3Jh cHBlciArIHh2ZmJfZmluZGNtZAotICAgICAgICB4dmZiX2ZvdW5kID0gcG9ydC5ob3N0LmV4ZWN1 dGl2ZS5ydW5fY29tbWFuZCh4dmZiX2ZpbmRjbWQsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkgaXMg MAorICAgICAgICB4dmZiX2ZvdW5kID0gcG9ydC5ob3N0LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZCh4 dmZiX2ZpbmRjbWQsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkgPT0gMAogICAgICAgICBpZiBub3Qg eHZmYl9mb3VuZDoKICAgICAgICAgICAgIF9sb2cuZXJyb3IoIk5vIFh2ZmIgZm91bmQuIENhbm5v dCBydW4gbGF5b3V0IHRlc3RzLiIpCiAgICAgICAgIHJldHVybiB4dmZiX2ZvdW5kCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2RldmljZV90eXBlLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZpY2VfdHlwZS5weQppbmRleCBiMzkwNmNlMDMxNi4u NzEzMDM4NDA4YmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2 aWNlX3R5cGUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZpY2VfdHlw ZS5weQpAQCAtNzUsNyArNzUsNyBAQCBjbGFzcyBEZXZpY2VUeXBlKG9iamVjdCk6CiAgICAgICAg IGlmIHNlbGYuaGFyZHdhcmVfZmFtaWx5IGlzIG5vdCBOb25lOgogICAgICAgICAgICAgYXNzZXJ0 IHNlbGYuc29mdHdhcmVfdmFyaWFudCBpcyBub3QgTm9uZQogICAgICAgICAgICAgaWYgc2VsZi5o YXJkd2FyZV9mYW1pbHkgPT0gJ0FwcGxlIFdhdGNoJzoKLSAgICAgICAgICAgICAgICBhc3NlcnQg c2VsZi5zb2Z0d2FyZV92YXJpYW50IGlzICd3YXRjaE9TJworICAgICAgICAgICAgICAgIGFzc2Vy dCBzZWxmLnNvZnR3YXJlX3ZhcmlhbnQgPT0gJ3dhdGNoT1MnCiAgICAgICAgICAgICBlbGlmIHNl bGYuaGFyZHdhcmVfZmFtaWx5ID09ICdBcHBsZSBUVic6CiAgICAgICAgICAgICAgICAgYXNzZXJ0 IHNlbGYuc29mdHdhcmVfdmFyaWFudCA9PSAndHZPUycKICAgICAgICAgICAgIGVsc2U6Cg==