217727 2020-10-14 13:04:40 -0700 [build.webkit.org] Add python 3 support - part 1 2021-02-08 07:37:49 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=218130 InRadar P2 Normal --- 175056 1 aakash_jain aakash_jain aakash_jain dewei_zhu jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1697846 0 aakash_jain 2020-10-14 13:04:40 -0700 [build.webkit.org] Add python 3 support. Python 3 support is required for Buildbot 2+. 1697847 1 411367 aakash_jain 2020-10-14 13:12:54 -0700 Created attachment 411367 Patch 1697906 2 411367 jbedard 2020-10-14 15:08:24 -0700 Comment on attachment 411367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411367&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:-5 > -import StringIO I assume we aren't using StringIO here, but if we find we need it, webkitcorepy has that standardized for code that needs to be both Python 2 and 3. 1697932 3 ews-feeder 2020-10-14 16:08:20 -0700 Committed r268496: <https://trac.webkit.org/changeset/268496> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411367. 1697934 4 webkit-bug-importer 2020-10-14 16:09:40 -0700 <rdar://problem/70312366> 411367 2020-10-14 13:12:54 -0700 2020-10-14 16:08:20 -0700 Patch bug-217727-20201014161253.patch text/plain 10805 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODQ3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTEwLTE0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gQWRkIHB5dGhvbiAzIHN1cHBvcnQgLSBw YXJ0IDEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NzcyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvc3RlcHMucHk6CisgICAg ICAgIChVcGxvYWRCdWlsdFByb2R1Y3QuX19pbml0X18pOiBDaGFuZ2VkIDA2NDQgdG8gMG82NDQu CisgICAgICAgIChVcGxvYWRUZXN0UmVzdWx0cy5fX2luaXRfXyk6IERpdHRvLgorICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3N0ZXBzX3VuaXR0ZXN0 LnB5OiBSZW1vdmVkIHVudXNlZCBpbXBvcnRzLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3J1bi1idWlsZGJvdC10ZXN0LnB5OiBVc2VkIC5mb3Jt YXQoKSBpbnN0ZWFkIG9mICUgc3RyaW5nIGZvcm1hdHRpbmcuCisKIDIwMjAtMTAtMTQgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBEaXNhbGxv dyBwb3J0cyBpbiBmaWxlIFVSTHMKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3J1bi1idWlsZGJvdC10ZXN0LnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3J1bi1idWlsZGJv dC10ZXN0LnB5CShyZXZpc2lvbiAyNjg0NzkpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9ydW4tYnVpbGRib3QtdGVzdC5weQkod29ya2luZyBjb3B5 KQpAQCAtNjIsNyArNjIsNyBAQCBmcm9tIGJ1aWxkc2xhdmUuYm90IGltcG9ydCBCdWlsZFNsYXZl CiBiYXNlZGlyID0gb3MucGF0aC5kaXJuYW1lKG9zLnBhdGgucmVhbHBhdGgoX19maWxlX18pKQog YnVpbGRtYXN0ZXJfaG9zdCA9ICdsb2NhbGhvc3QnCiBwb3J0ID0gMTcwMDAKLXNsYXZlbmFtZSA9 ICclKHdvcmtlcilzJworc2xhdmVuYW1lID0gJ3t9JwogcGFzc3dkID0gJzEyMzQnCiBrZWVwYWxp dmUgPSA2MDAKIHVzZXB0eSA9IDEKQEAgLTk1LDcgKzk1LDcgQEAgZGVmIHVwZ3JhZGVfZGJfbmVl ZGVkKGxvZyk6CiBkZWYgY3JlYXRlX3RlbXBkaXIodG1wZGlyPU5vbmUpOgogICAgIGlmIHRtcGRp ciBpcyBub3QgTm9uZToKICAgICAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIodG1wZGlyKToKLSAg ICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJyVzIGlzIG5vdCBhIGRpcmVjdG9yeScgJSB0bXBk aXIpCisgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCd7fSBpcyBub3QgYSBkaXJlY3Rvcnkn LmZvcm1hdCh0bXBkaXIpKQogICAgICAgICByZXR1cm4gdGVtcGZpbGUubWtkdGVtcChwcmVmaXg9 b3MucGF0aC5qb2luKG9zLnBhdGguYWJzcGF0aCh0bXBkaXIpLCAndG1wJykpCiAgICAgcmV0dXJu IHRlbXBmaWxlLm1rZHRlbXAoKQogCkBAIC0xMDQsNyArMTA0LDcgQEAgZGVmIHByaW50X2lmX2Vy cm9yX3N0ZG91dF9zdGRlcnIoY21kLCByZQogICAgIGlmIHJldGNvZGUgIT0gMDoKICAgICAgICAg aWYgdHlwZShjbWQpID09IHR5cGUoW10pOgogICAgICAgICAgICAgY21kID0gJyAnLmpvaW4oY21k KQotICAgICAgICBwcmludCgnV0FSTklORzogIiVzIiByZXR1cm5lZCAlcyBzdGF0dXMgY29kZScg JSAoY21kLCByZXRjb2RlKSkKKyAgICAgICAgcHJpbnQoJ1dBUk5JTkc6ICJ7Y21kfSIgcmV0dXJu ZWQge3JldGNvZGV9IHN0YXR1cyBjb2RlJy5mb3JtYXQoY21kPWNtZCwgcmV0Y29kZT1yZXRjb2Rl KSkKICAgICAgICAgaWYgc3Rkb3V0IGlzIG5vdCBOb25lOgogICAgICAgICAgICAgcHJpbnQoc3Rk b3V0KQogICAgICAgICBpZiBzdGRlcnIgaXMgbm90IE5vbmU6CkBAIC0xMTUsOSArMTE1LDkgQEAg ZGVmIHByaW50X2lmX2Vycm9yX3N0ZG91dF9zdGRlcnIoY21kLCByZQogCiBkZWYgc2V0dXBfbWFz dGVyX3dvcmtkaXIoY29uZmlnZGlyLCBiYXNlX3dvcmtkaXIpOgogICAgIG1hc3Rlcl93b3JrZGly ID0gb3MucGF0aC5qb2luKGJhc2Vfd29ya2RpciwgJ21hc3RlcicpCi0gICAgcHJpbnQoJ0NvcHlp bmcgZmlsZXMgZnJvbSAlcyB0byAlcyAuLi4nICUgKGNvbmZpZ2RpciwgbWFzdGVyX3dvcmtkaXIp KQorICAgIHByaW50KCdDb3B5aW5nIGZpbGVzIGZyb20ge30gdG8ge30gLi4uJy5mb3JtYXQoY29u ZmlnZGlyLCBtYXN0ZXJfd29ya2RpcikpCiAgICAgc2h1dGlsLmNvcHl0cmVlKGNvbmZpZ2Rpciwg bWFzdGVyX3dvcmtkaXIpCi0gICAgcHJpbnQoJ0dlbmVyYXRpbmcgYnVpbGRib3QgZmlsZXMgYXQg JXMgLi4uJyAlIG1hc3Rlcl93b3JrZGlyKQorICAgIHByaW50KCdHZW5lcmF0aW5nIGJ1aWxkYm90 IGZpbGVzIGF0IHt9IC4uLicuZm9ybWF0KG1hc3Rlcl93b3JrZGlyKSkKICAgICB3aXRoIG9wZW4o b3MucGF0aC5qb2luKG1hc3Rlcl93b3JrZGlyLCAnYnVpbGRib3QudGFjJyksICd3JykgYXMgZjoK ICAgICAgICAgZi53cml0ZSh0ZXN0X2J1aWxkYm90X21hc3Rlcl90YWMpCiAgICAgbWtwd2RfY21k ID0gWycuL21ha2VfcGFzc3dvcmRzX2pzb24ucHknXQpAQCAtMTU4LDEzICsxNTgsMTMgQEAgZGVm IHN0YXJ0X21hc3RlcihtYXN0ZXJfd29ya2Rpcik6CiAgICAgICAgIHdoaWxlIHR3aXN0ZF9wcm9j ZXNzLnBvbGwoKSBpcyBOb25lOgogICAgICAgICAgICAgaWYgY2hlY2tfdGNwX3BvcnRfb3Blbign bG9jYWxob3N0JywgODcxMCk6CiAgICAgICAgICAgICAgICAgcHJpbnQoJ1Rlc3QgYnVpbGRtYXN0 ZXIgcmVhZHkhLlxuXG4nCi0gICAgICAgICAgICAgICAgICAgICArICcgLSBTZWUgYnVpbGRtYXN0 ZXIgbG9nOlxuJwotICAgICAgICAgICAgICAgICAgICAgKyAnICAgICB0YWlsIC1mICVzXG4nICUg YnVpbGRtYXN0ZXJsb2cKLSAgICAgICAgICAgICAgICAgICAgICsgJyAtIE9wZW4gYSBicm93c2Vy IHRvOlxuJwotICAgICAgICAgICAgICAgICAgICAgKyAnICAgICBodHRwOi8vbG9jYWxob3N0Ojg3 MTBcbicKLSAgICAgICAgICAgICAgICAgICAgICsgJyAtIENyZWRlbnRpYWxzIGZvciB0cmlnZ2Vy aW5nIG1hbnVhbCBidWlsZHM6XG4nCi0gICAgICAgICAgICAgICAgICAgICArICcgICAgIGxvZ2lu OiAgICAgY29tbWl0dGVyQHdlYmtpdC5vcmdcbicKLSAgICAgICAgICAgICAgICAgICAgICsgJyAg ICAgcGFzc3dvcmQ6ICBjb21taXR0ZXJwYXNzd29yZFxuJykKKyAgICAgICAgICAgICAgICAgICAg ICArICcgLSBTZWUgYnVpbGRtYXN0ZXIgbG9nOlxuJworICAgICAgICAgICAgICAgICAgICAgICsg JyAgICAgdGFpbCAtZiB7fVxuJy5mb3JtYXQoYnVpbGRtYXN0ZXJsb2cpCisgICAgICAgICAgICAg ICAgICAgICAgKyAnIC0gT3BlbiBhIGJyb3dzZXIgdG86XG4nCisgICAgICAgICAgICAgICAgICAg ICAgKyAnICAgICBodHRwOi8vbG9jYWxob3N0Ojg3MTBcbicKKyAgICAgICAgICAgICAgICAgICAg ICArICcgLSBDcmVkZW50aWFscyBmb3IgdHJpZ2dlcmluZyBtYW51YWwgYnVpbGRzOlxuJworICAg ICAgICAgICAgICAgICAgICAgICsgJyAgICAgbG9naW46ICAgICBjb21taXR0ZXJAd2Via2l0Lm9y Z1xuJworICAgICAgICAgICAgICAgICAgICAgICsgJyAgICAgcGFzc3dvcmQ6ICBjb21taXR0ZXJw YXNzd29yZFxuJykKICAgICAgICAgICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKG1hc3Rl cl93b3JrZGlyLCAnLm1hc3Rlci1pcy1yZWFkeScpLCAndycpIGFzIGY6CiAgICAgICAgICAgICAg ICAgICAgIGYud3JpdGUoJ3JlYWR5JykKICAgICAgICAgICAgICAgICB0d2lzdGRfcHJvY2Vzcy53 YWl0KCkKQEAgLTE4Miw3ICsxODIsNyBAQCBkZWYgc3RhcnRfbWFzdGVyKG1hc3Rlcl93b3JrZGly KToKICAgICAgICAgICAgIHByaW50X2lmX2Vycm9yX3N0ZG91dF9zdGRlcnIodXBncmFkZV9jbWQs IHVwZ3JhZGVfcHJvY2Vzcy5yZXR1cm5jb2RlLCBzdGRvdXQsIHN0ZGVycikKICAgICAgICAgZWxz ZToKICAgICAgICAgICAgIHByaW50X2lmX2Vycm9yX3N0ZG91dF9zdGRlcnIodHdpc3RkX2NtZCwg dHdpc3RkX3Byb2Nlc3MucmV0dXJuY29kZSwgc3Rkb3V0LCBzdGRlcnIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICdDaGVjayB0aGUgbG9nIGF0ICVzJyAlIGJ1aWxk bWFzdGVybG9nKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnQ2hl Y2sgdGhlIGxvZyBhdCB7fScuZm9ybWF0KGJ1aWxkbWFzdGVybG9nKSkKICAgICByZXR1cm4gMAog CiAKQEAgLTE5MSw3ICsxOTEsNyBAQCBkZWYgZ2V0X2xpc3Rfd29ya2VycyhtYXN0ZXJfd29ya2Rp cik6CiAgICAgd2l0aCBvcGVuKHBhc3N3b3JkX2xpc3QpIGFzIGY6CiAgICAgICAgIHBhc3N3b3Jk cyA9IGpzb24ubG9hZChmKQogICAgIGxpc3Rfd29ya2VycyA9IFtdCi0gICAgZm9yIHdvcmtlciBp biBwYXNzd29yZHMua2V5cygpOgorICAgIGZvciB3b3JrZXIgaW4gcGFzc3dvcmRzOgogICAgICAg ICBsaXN0X3dvcmtlcnMuYXBwZW5kKHN0cih3b3JrZXIpKQogICAgIHJldHVybiBsaXN0X3dvcmtl cnMKIApAQCAtMjAzLDcgKzIwMyw3IEBAIGRlZiBzdGFydF93b3JrZXIoYmFzZV93b3JrZGlyLCB3 b3JrZXIpOgogICAgIHdvcmtlcl93b3JrZGlyID0gb3MucGF0aC5qb2luKGJhc2Vfd29ya2Rpciwg d29ya2VyKQogICAgIG9zLm1rZGlyKHdvcmtlcl93b3JrZGlyKQogICAgIHdpdGggb3Blbihvcy5w YXRoLmpvaW4od29ya2VyX3dvcmtkaXIsICdidWlsZGJvdC50YWMnKSwgJ3cnKSBhcyBmOgotICAg ICAgICBmLndyaXRlKHdvcmtlcl9idWlsZGJvdF9tYXN0ZXJfdGFjICUgeyd3b3JrZXInOiB3b3Jr ZXJ9KQorICAgICAgICBmLndyaXRlKHdvcmtlcl9idWlsZGJvdF9tYXN0ZXJfdGFjLmZvcm1hdCh3 b3JrZXIpKQogICAgIHR3aXN0ZF9jbWQgPSBbJ3R3aXN0ZCcsICctbCcsICd3b3JrZXIubG9nJywg Jy1ub3knLCAnYnVpbGRib3QudGFjJ10KICAgICB0d2lzdGRfd29ya2VyX3Byb2Nlc3MgPSBzdWJw cm9jZXNzLlBvcGVuKHR3aXN0ZF9jbWQsIGN3ZD13b3JrZXJfd29ya2RpciwKICAgICAgICAgc3Rk b3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJyPXN1YnByb2Nlc3MuU1RET1VUKQpAQCAtMjEzLDEy ICsyMTMsMTIgQEAgZGVmIHN0YXJ0X3dvcmtlcihiYXNlX3dvcmtkaXIsIHdvcmtlcik6CiAgICAg ICAgIHR3aXN0ZF93b3JrZXJfcHJvY2Vzcy5raWxsKCkKICAgICAgICAgcmV0dXJuCiAgICAgcHJp bnRfaWZfZXJyb3Jfc3Rkb3V0X3N0ZGVycih0d2lzdGRfY21kLCB0d2lzdGRfd29ya2VyX3Byb2Nl c3MucmV0dXJuY29kZSwgc3Rkb3V0LCBzdGRlcnIsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnQ2hlY2sgdGhlIGxvZyBhdCAlcycgJSBvcy5wYXRoLmpvaW4od29ya2VyX3dvcmtk aXIsICd3b3JrZXIubG9nJykpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnQ2hl Y2sgdGhlIGxvZyBhdCB7fScuZm9ybWF0KG9zLnBhdGguam9pbih3b3JrZXJfd29ya2RpciwgJ3dv cmtlci5sb2cnKSkpCiAKIAogZGVmIGNsZWFuKHRlbXBfZGlyKToKICAgICBpZiBvcy5wYXRoLmlz ZGlyKHRlbXBfZGlyKToKLSAgICAgICAgcHJpbnQoJ1xuXG5DbGVhbmluZyAlcyAuLi4gXG4nICUg KHRlbXBfZGlyKSkKKyAgICAgICAgcHJpbnQoJ1xuXG5DbGVhbmluZyB7fSAuLi4gXG4nLmZvcm1h dCh0ZW1wX2RpcikpCiAgICAgICAgICMgc2h1dGlsLnJtdHJlZSBjYW4gZmFpbCBpZiB3ZSBob2xk IGFuIG9wZW4gZmlsZSBkZXNjcmlwdG9yIG9uIHRlbXBfZGlyCiAgICAgICAgICMgKHdoaWNoIGlz IHZlcnkgbGlrZWx5IHdoZW4gY2xlYW5pbmcpIG9yIGlmIHRlbXBfZGlyIGlzIGEgTkZTIG1vdW50 LgogICAgICAgICAjIFVzZSBybSBpbnN0ZWFkIHRoYXQgYWx3YXlzIHdvcmtzLgpAQCAtMjM5LDcg KzIzOSw3IEBAIGRlZiBjaGVja19idWlsZGJvdF9pbnN0YWxsZWQoKToKIAogZGVmIHNldHVwX3Zp cnR1YWxlbnYoYmFzZV93b3JrZGlyX3RlbXApOgogICAgIGlmIGNtZF9leGlzdHMoJ3ZpcnR1YWxl bnYnKToKLSAgICAgICAgcHJpbnQoJ1NldHRpbmcgdXAgdmlydHVhbGVudiBhdCAlcyAuLi4gJyAl IGJhc2Vfd29ya2Rpcl90ZW1wKQorICAgICAgICBwcmludCgnU2V0dGluZyB1cCB2aXJ0dWFsZW52 IGF0IHt9IC4uLiAnLmZvcm1hdChiYXNlX3dvcmtkaXJfdGVtcCkpCiAgICAgICAgIHZpcnR1YWxl bnZfY21kID0gWyd2aXJ0dWFsZW52JywgJy1wJywgJ3B5dGhvbjInLCAndmVudiddCiAgICAgICAg IHZpcnR1YWxlbnZfcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4odmlydHVhbGVudl9jbWQsIGN3 ZD1iYXNlX3dvcmtkaXJfdGVtcCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0ZGVycj1zdWJwcm9jZXNzLlNU RE9VVCkKQEAgLTI4MSwxMCArMjgxLDEwIEBAIGRlZiBjb25maWdkaXJfaXNfdmFsaWQoY29uZmln ZGlyKToKIGRlZiBtYWluKGNvbmZpZ2RpciwgYmFzZXRlbXBkaXI9Tm9uZSwgbm9fY2xlYW49RmFs c2UsIG5vX3dvcmtlcnM9RmFsc2UsIHVzZV9zeXN0ZW1fdmVyc2lvbj1GYWxzZSk6CiAgICAgY29u ZmlnZGlyID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGgucmVhbHBhdGgoY29uZmlnZGlyKSkKICAg ICBpZiBub3QgY29uZmlnZGlyX2lzX3ZhbGlkKGNvbmZpZ2Rpcik6Ci0gICAgICAgIHJhaXNlIFZh bHVlRXJyb3IoJ1RoZSBjb25maWdkaXIgJXMgZG9udCBjb250YWlucyB0aGUgYnVpbGRtYXN0ZXIg ZmlsZXMgZXhwZWN0ZWQgYnkgdGhpcyBzY3JpcHQnICUgY29uZmlnZGlyKQorICAgICAgICByYWlz ZSBWYWx1ZUVycm9yKCdUaGUgY29uZmlnZGlyIHt9IGRvbnQgY29udGFpbnMgdGhlIGJ1aWxkbWFz dGVyIGZpbGVzIGV4cGVjdGVkIGJ5IHRoaXMgc2NyaXB0Jy5mb3JtYXQoY29uZmlnZGlyKSkKICAg ICBiYXNlX3dvcmtkaXJfdGVtcCA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLnJlYWxwYXRoKGNy ZWF0ZV90ZW1wZGlyKGJhc2V0ZW1wZGlyKSkpCiAgICAgaWYgYmFzZV93b3JrZGlyX3RlbXAuc3Rh cnRzd2l0aChjb25maWdkaXIpOgotICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdUaGUgdGVtcG9y YWwgd29ya2luZyBkaXJlY3RvcnkgJXMgY2FudCBiZSBsb2NhdGVkIGluc2lkZSBjb25maWdkaXIg JXMnICUgKGJhc2Vfd29ya2Rpcl90ZW1wLCBjb25maWdkaXIpKQorICAgICAgICByYWlzZSBWYWx1 ZUVycm9yKCdUaGUgdGVtcG9yYWwgd29ya2luZyBkaXJlY3Rvcnkge30gY2FudCBiZSBsb2NhdGVk IGluc2lkZSBjb25maWdkaXIge30nLmZvcm1hdChiYXNlX3dvcmtkaXJfdGVtcCwgY29uZmlnZGly KSkKICAgICB0cnk6CiAgICAgICAgIGlmIG5vdCB1c2Vfc3lzdGVtX3ZlcnNpb246CiAgICAgICAg ICAgICBzZXR1cF92aXJ0dWFsZW52KGJhc2Vfd29ya2Rpcl90ZW1wKQpAQCAtMjk1LDkgKzI5NSw5 IEBAIGRlZiBtYWluKGNvbmZpZ2RpciwgYmFzZXRlbXBkaXI9Tm9uZSwgbm8KICAgICAgICAgd2Fp dF9mb3JfbWFzdGVyX3JlYWR5KG1hc3Rlcl93b3JrZGlyKQogICAgICAgICBpZiBub193b3JrZXJz OgogICAgICAgICAgICAgcHJpbnQoJyAtIFRvIG1hbnVhbGx5IGF0dGFjaCBhIGJ1aWxkIHdvcmtl ciB1c2UgdGhpcyBpbmZvOlxuJwotICAgICAgICAgICAgICAgICArICcgICAgIFRDUCBwb3J0IGZv ciB0aGUgd29ya2VyLXRvLW1hc3RlciBjb25uZWN0aW9uOiAxNzAwMFxuJwotICAgICAgICAgICAg ICAgICArICcgICAgIHdvcmtlci1pZDogdGhlIG9uZSBkZWZpbmVkIGF0ICVzXG4nICUgb3MucGF0 aC5qb2luKG1hc3Rlcl93b3JrZGlyLCAncGFzc3dvcmRzLmpzb24nKQotICAgICAgICAgICAgICAg ICArICcgICAgIHBhc3N3b3JkOiAgMTIzNFxuJykKKyAgICAgICAgICAgICAgICAgICsgJyAgICAg VENQIHBvcnQgZm9yIHRoZSB3b3JrZXItdG8tbWFzdGVyIGNvbm5lY3Rpb246IDE3MDAwXG4nCisg ICAgICAgICAgICAgICAgICArICcgICAgIHdvcmtlci1pZDogdGhlIG9uZSBkZWZpbmVkIGF0IHt9 XG4nLmZvcm1hdChvcy5wYXRoLmpvaW4obWFzdGVyX3dvcmtkaXIsICdwYXNzd29yZHMuanNvbicp KQorICAgICAgICAgICAgICAgICAgKyAnICAgICBwYXNzd29yZDogIDEyMzRcbicpCiAgICAgICAg IGVsc2U6CiAgICAgICAgICAgICB3b3JrZXJfcnVubmVycyA9IFtdCiAgICAgICAgICAgICBmb3Ig d29ya2VyIGluIGdldF9saXN0X3dvcmtlcnMobWFzdGVyX3dvcmtkaXIpOgpAQCAtMzA1LDggKzMw NSw4IEBAIGRlZiBtYWluKGNvbmZpZ2RpciwgYmFzZXRlbXBkaXI9Tm9uZSwgbm8KICAgICAgICAg ICAgICAgICB3b3JrZXJfcnVubmVyLnN0YXJ0KCkKICAgICAgICAgICAgICAgICB3b3JrZXJfcnVu bmVycy5hcHBlbmQod29ya2VyX3J1bm5lcikKICAgICAgICAgICAgIHByaW50KCcgLSBXb3JrZXJz IHN0YXJ0ZWQhLlxuJwotICAgICAgICAgICAgICAgICArICcgICAgIENoZWNrIHRoZSBsb2cgZm9y IGVhY2ggb25lIGF0ICVzLyR7d29ya2VyLW5hbWUtaWR9L3dvcmtlci5sb2dcbicgJSBiYXNlX3dv cmtkaXJfdGVtcAotICAgICAgICAgICAgICAgICArICcgICAgIHRhaWwgLWYgJXMvKi93b3JrZXIu bG9nXG4nICUgYmFzZV93b3JrZGlyX3RlbXApCisgICAgICAgICAgICAgICAgICArICcgICAgIENo ZWNrIHRoZSBsb2cgZm9yIGVhY2ggb25lIGF0IHt9LyR7d29ya2VyLW5hbWUtaWR9L3dvcmtlci5s b2dcbicuZm9ybWF0KGJhc2Vfd29ya2Rpcl90ZW1wKQorICAgICAgICAgICAgICAgICAgKyAnICAg ICB0YWlsIC1mIHt9Lyovd29ya2VyLmxvZ1xuJy5mb3JtYXQoYmFzZV93b3JrZGlyX3RlbXApKQog ICAgICAgICAgICAgZm9yIHdvcmtlcl9ydW5uZXIgaW4gd29ya2VyX3J1bm5lcnM6CiAgICAgICAg ICAgICAgICAgd29ya2VyX3J1bm5lci5qb2luKCkKICAgICAgICAgbWFzdGVyX3J1bm5lci5qb2lu KCkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3N0ZXBzLnB5CShyZXZpc2lvbiAyNjg0NzkpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9zdGVwcy5weQkod29ya2luZyBj b3B5KQpAQCAtMzM5LDcgKzMzOSw3IEBAIGNsYXNzIFVwbG9hZEJ1aWx0UHJvZHVjdCh0cmFuc2Zl ci5GaWxlVXAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBrd2Fy Z3NbJ3NsYXZlc3JjJ10gPSBzZWxmLnNsYXZlc3JjCiAgICAgICAgIGt3YXJnc1snbWFzdGVyZGVz dCddID0gc2VsZi5tYXN0ZXJkZXN0Ci0gICAgICAgIGt3YXJnc1snbW9kZSddID0gMDY0NAorICAg ICAgICBrd2FyZ3NbJ21vZGUnXSA9IDBvNjQ0CiAgICAgICAgIGt3YXJnc1snYmxvY2tzaXplJ10g PSAxMDI0ICogMjU2CiAgICAgICAgIHRyYW5zZmVyLkZpbGVVcGxvYWQuX19pbml0X18oc2VsZiwg Kiprd2FyZ3MpCiAKQEAgLTEwMzAsNyArMTAzMCw3IEBAIGNsYXNzIFVwbG9hZFRlc3RSZXN1bHRz KHRyYW5zZmVyLkZpbGVVcGwKICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgogICAg ICAgICBrd2FyZ3NbJ3NsYXZlc3JjJ10gPSBzZWxmLnNsYXZlc3JjCiAgICAgICAgIGt3YXJnc1sn bWFzdGVyZGVzdCddID0gc2VsZi5tYXN0ZXJkZXN0Ci0gICAgICAgIGt3YXJnc1snbW9kZSddID0g MDY0NAorICAgICAgICBrd2FyZ3NbJ21vZGUnXSA9IDBvNjQ0CiAgICAgICAgIGt3YXJnc1snYmxv Y2tzaXplJ10gPSAxMDI0ICogMjU2CiAgICAgICAgIHRyYW5zZmVyLkZpbGVVcGxvYWQuX19pbml0 X18oc2VsZiwgKiprd2FyZ3MpCiAKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3N0ZXBzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3N0ZXBzX3VuaXR0ZXN0 LnB5CShyZXZpc2lvbiAyNjg0NzkpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMiw5 ICsyLDcgQEAKIAogaW1wb3J0IHN5cwogaW1wb3J0IG9zCi1pbXBvcnQgU3RyaW5nSU8KIGltcG9y dCB1bml0dGVzdAotaW1wb3J0IG1ha2VfcGFzc3dvcmRzX2pzb24KIGltcG9ydCBqc29uCiAKICMg U2hvdyBEZXByaWNhdGlvbldhcm5pbmdzIGNvbWUgZnJvbSBidWlsZGJvdCAtIGl0IGlzbid0IGRl ZmF1bHQgd2l0aCBQeXRob24gMi43IG9yIG5ld2VyLgo=