213971 2020-07-05 05:27:00 -0700 Web Inspector: Fix python3 build warnings 2020-07-05 07:24:15 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand bburg ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam sam tzagallo webkit-bug-importer oldest_to_newest 1668884 0 pnormand 2020-07-05 05:27:00 -0700 I get a bunch of those: Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py:70: SyntaxWarning: "is" with a literal. Did you mean "=="? elif _type.raw_name() is 'number': 1668889 1 403556 pnormand 2020-07-05 06:27:15 -0700 Created attachment 403556 Patch 1668890 2 ews-watchlist 2020-07-05 06:28:05 -0700 This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`) 1668894 3 ews-feeder 2020-07-05 07:23:07 -0700 Committed r263951: <https://trac.webkit.org/changeset/263951> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403556. 1668895 4 webkit-bug-importer 2020-07-05 07:24:15 -0700 <rdar://problem/65107011> 403556 2020-07-05 06:27:15 -0700 2020-07-05 07:23:08 -0700 Patch bug-213971-20200705062713.patch text/plain 14074 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzOTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy MjI0YjY3OTljNzljYjlmZjI5YmE5YzRmMzE3YjczN2QyNWI2ZTQzLi4zNTA4ODFjODlkNDVkN2M2 MGM0MmFhMDFmNGY5YmY5MTM1Yzc3MDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAyMC0wNy0wNSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxp YS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IHB5dGhvbjMgYnVpbGQgd2Fybmlu Z3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzk3 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBQ eXRob24zIHN5bnRheCB3YXJuaW5ncy4gVXNpbmcgJ2lzJyB3aXRoIHN0cmluZyBsaXRlcmFscyB0 cmlnZ2VycyB0aG9zZS4gQWRvcHQgdGhlID09CisgICAgICAgIG9wZXJhdG9yIGluc3RlYWQsIHdo aWNoIGlzIG1vcmUgaWRpb21hdGljIGFueXdheS4KKworICAgICAgICAqIGluc3BlY3Rvci9zY3Jp cHRzL2NvZGVnZW4vY3BwX2dlbmVyYXRvci5weToKKyAgICAgICAgKENwcEdlbmVyYXRvci5jcHBf Z2V0dGVyX21ldGhvZF9mb3JfdHlwZSk6CisgICAgICAgIChDcHBHZW5lcmF0b3IuY3BwX3NldHRl cl9tZXRob2RfZm9yX3R5cGUpOgorICAgICAgICAqIGluc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4v b2JqY19nZW5lcmF0b3IucHk6CisgICAgICAgIChPYmpDVHlwZUNhdGVnb3J5LmNhdGVnb3J5X2Zv cl90eXBlKToKKyAgICAgICAgKE9iakNHZW5lcmF0b3Iub2JqY190eXBlX2Zvcl9yYXdfbmFtZSk6 CisgICAgICAgIChPYmpDR2VuZXJhdG9yLm9iamNfY2xhc3NfZm9yX3Jhd19uYW1lKToKKyAgICAg ICAgKE9iakNHZW5lcmF0b3IucHJvdG9jb2xfdHlwZV9mb3JfcmF3X25hbWUpOgorICAgICAgICAo T2JqQ0dlbmVyYXRvci5vYmpjX3Byb3RvY29sX2V4cG9ydF9leHByZXNzaW9uX2Zvcl92YXJpYWJs ZSk6CisgICAgICAgIChPYmpDR2VuZXJhdG9yLm9iamNfcHJvdG9jb2xfaW1wb3J0X2V4cHJlc3Np b25fZm9yX3ZhcmlhYmxlKToKKyAgICAgICAgKE9iakNHZW5lcmF0b3Iub2JqY190b19wcm90b2Nv bF9leHByZXNzaW9uX2Zvcl9tZW1iZXIpOgorICAgICAgICAoT2JqQ0dlbmVyYXRvci5wcm90b2Nv bF90b19vYmpjX2V4cHJlc3Npb25fZm9yX21lbWJlcik6CisgICAgICAgIChPYmpDR2VuZXJhdG9y LnBheWxvYWRfdG9fb2JqY19leHByZXNzaW9uX2Zvcl9tZW1iZXIpOgorICAgICAgICAoT2JqQ0dl bmVyYXRvci5vYmpjX3NldHRlcl9tZXRob2RfZm9yX21lbWJlcl9pbnRlcm5hbCk6CisgICAgICAg IChPYmpDR2VuZXJhdG9yLm9iamNfZ2V0dGVyX21ldGhvZF9mb3JfbWVtYmVyX2ludGVybmFsKToK KyAgICAgICAgKE9iakNHZW5lcmF0b3Iub2JqY19wcm90b2NvbF9leHBvcnRfZXhwcmVzc2lvbl9m b3JfdmFyaWFibGUuaXMpOiBEZWxldGVkLgorICAgICAgICAoT2JqQ0dlbmVyYXRvci5vYmpjX3By b3RvY29sX2ltcG9ydF9leHByZXNzaW9uX2Zvcl92YXJpYWJsZS5pcyk6IERlbGV0ZWQuCisgICAg ICAgIChPYmpDR2VuZXJhdG9yLm9iamNfdG9fcHJvdG9jb2xfZXhwcmVzc2lvbl9mb3JfbWVtYmVy LmlzKTogRGVsZXRlZC4KKyAgICAgICAgKE9iakNHZW5lcmF0b3IucHJvdG9jb2xfdG9fb2JqY19l eHByZXNzaW9uX2Zvcl9tZW1iZXIuaXMpOiBEZWxldGVkLgorCiAyMDIwLTA3LTA0ICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFJlbW92ZSBhbGwgZmVh dHVyZXMgZnJvbSBGZWF0dXJlRGVmaW5lcy54Y2NvbmZpZyB0aGF0IGFyZSBhbHJlYWR5IG1lbnRp b25lZCBpbiBQbGF0Zm9ybUVuYWJsZUNvY29hLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2NwcF9nZW5lcmF0b3IucHkgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9jcHBfZ2VuZXJhdG9y LnB5CmluZGV4IGRmODM3NzVjOWEwNGY4MTRiYjRhZDVmZWFjNDFmYTRjYTRhMWVmYTMuLjk1ZTM4 ZTIzYjRmNjRmZDRjYTIxNGZlNmY2MGZlY2M3OTBjNTU0ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2NwcF9nZW5lcmF0b3IucHkK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vY3Bw X2dlbmVyYXRvci5weQpAQCAtNjUsMTEgKzY1LDExIEBAIGNsYXNzIENwcEdlbmVyYXRvcihHZW5l cmF0b3IpOgogICAgICAgICBpZiBpc2luc3RhbmNlKF90eXBlLCBBcnJheVR5cGUpOgogICAgICAg ICAgICAgcmV0dXJuICdnZXRBcnJheScKICAgICAgICAgaWYgaXNpbnN0YW5jZShfdHlwZSwgUHJp bWl0aXZlVHlwZSk6Ci0gICAgICAgICAgICBpZiBfdHlwZS5yYXdfbmFtZSgpIGlzICdpbnRlZ2Vy JzoKKyAgICAgICAgICAgIGlmIF90eXBlLnJhd19uYW1lKCkgPT0gJ2ludGVnZXInOgogICAgICAg ICAgICAgICAgIHJldHVybiAnZ2V0SW50ZWdlcicKLSAgICAgICAgICAgIGVsaWYgX3R5cGUucmF3 X25hbWUoKSBpcyAnbnVtYmVyJzoKKyAgICAgICAgICAgIGVsaWYgX3R5cGUucmF3X25hbWUoKSA9 PSAnbnVtYmVyJzoKICAgICAgICAgICAgICAgICByZXR1cm4gJ2dldERvdWJsZScKLSAgICAgICAg ICAgIGVsaWYgX3R5cGUucmF3X25hbWUoKSBpcyAnYW55JzoKKyAgICAgICAgICAgIGVsaWYgX3R5 cGUucmF3X25hbWUoKSA9PSAnYW55JzoKICAgICAgICAgICAgICAgICByZXR1cm4gJ2dldFZhbHVl JwogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICByZXR1cm4gJ2dldCcgKyB1Y2Zp cnN0KF90eXBlLnJhd19uYW1lKCkpCkBAIC04NSwxMSArODUsMTEgQEAgY2xhc3MgQ3BwR2VuZXJh dG9yKEdlbmVyYXRvcik6CiAgICAgICAgIGlmIGlzaW5zdGFuY2UoX3R5cGUsIEFycmF5VHlwZSk6 CiAgICAgICAgICAgICByZXR1cm4gJ3NldEFycmF5JwogICAgICAgICBpZiBpc2luc3RhbmNlKF90 eXBlLCBQcmltaXRpdmVUeXBlKToKLSAgICAgICAgICAgIGlmIF90eXBlLnJhd19uYW1lKCkgaXMg J2ludGVnZXInOgorICAgICAgICAgICAgaWYgX3R5cGUucmF3X25hbWUoKSA9PSAnaW50ZWdlcic6 CiAgICAgICAgICAgICAgICAgcmV0dXJuICdzZXRJbnRlZ2VyJwotICAgICAgICAgICAgZWxpZiBf dHlwZS5yYXdfbmFtZSgpIGlzICdudW1iZXInOgorICAgICAgICAgICAgZWxpZiBfdHlwZS5yYXdf bmFtZSgpID09ICdudW1iZXInOgogICAgICAgICAgICAgICAgIHJldHVybiAnc2V0RG91YmxlJwot ICAgICAgICAgICAgZWxpZiBfdHlwZS5yYXdfbmFtZSgpIGlzICdhbnknOgorICAgICAgICAgICAg ZWxpZiBfdHlwZS5yYXdfbmFtZSgpID09ICdhbnknOgogICAgICAgICAgICAgICAgIHJldHVybiAn c2V0VmFsdWUnCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIHJldHVybiAnc2V0 JyArIHVjZmlyc3QoX3R5cGUucmF3X25hbWUoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL29iamNfZ2VuZXJhdG9yLnB5IGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vb2JqY19nZW5lcmF0 b3IucHkKaW5kZXggN2U4YzM4MWM1MDJjMWY4MTk4ZDZhNWFlZDZlMGEzYmJlMGMwOWY3MC4uNzMx NTNiOTU0NjY3MmI5OTA0ZTdmNWViOTE4ODY1ZmM4YTUxNjhiNiAxMDA3NTUKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vb2JqY19nZW5lcmF0b3Iu cHkKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4v b2JqY19nZW5lcmF0b3IucHkKQEAgLTY2LDExICs2NiwxMSBAQCBjbGFzcyBPYmpDVHlwZUNhdGVn b3J5OgogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgY2F0ZWdvcnlfZm9yX3R5cGUoX3R5cGUp OgogICAgICAgICBpZiAoaXNpbnN0YW5jZShfdHlwZSwgUHJpbWl0aXZlVHlwZSkpOgotICAgICAg ICAgICAgaWYgX3R5cGUucmF3X25hbWUoKSBpcyAnc3RyaW5nJzoKKyAgICAgICAgICAgIGlmIF90 eXBlLnJhd19uYW1lKCkgPT0gJ3N0cmluZyc6CiAgICAgICAgICAgICAgICAgcmV0dXJuIE9iakNU eXBlQ2F0ZWdvcnkuU3RyaW5nCiAgICAgICAgICAgICBpZiAgX3R5cGUucmF3X25hbWUoKSBpbiBb J29iamVjdCcsICdhbnknXToKICAgICAgICAgICAgICAgICByZXR1cm4gT2JqQ1R5cGVDYXRlZ29y eS5PYmplY3QKLSAgICAgICAgICAgIGlmIF90eXBlLnJhd19uYW1lKCkgaXMgJ2FycmF5JzoKKyAg ICAgICAgICAgIGlmIF90eXBlLnJhd19uYW1lKCkgPT0gJ2FycmF5JzoKICAgICAgICAgICAgICAg ICByZXR1cm4gT2JqQ1R5cGVDYXRlZ29yeS5BcnJheQogICAgICAgICAgICAgcmV0dXJuIE9iakNU eXBlQ2F0ZWdvcnkuU2ltcGxlCiAgICAgICAgIGlmIChpc2luc3RhbmNlKF90eXBlLCBPYmplY3RU eXBlKSk6CkBAIC0yMTIsMTUgKzIxMiwxNSBAQCBjbGFzcyBPYmpDR2VuZXJhdG9yKEdlbmVyYXRv cik6CiAKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIG9iamNfdHlwZV9mb3JfcmF3X25hbWUo cmF3X25hbWUpOgotICAgICAgICBpZiByYXdfbmFtZSBpcyAnc3RyaW5nJzoKKyAgICAgICAgaWYg cmF3X25hbWUgPT0gJ3N0cmluZyc6CiAgICAgICAgICAgICByZXR1cm4gJ05TU3RyaW5nIConCi0g ICAgICAgIGlmIHJhd19uYW1lIGlzICdhcnJheSc6CisgICAgICAgIGlmIHJhd19uYW1lID09ICdh cnJheSc6CiAgICAgICAgICAgICByZXR1cm4gJ05TQXJyYXkgKicKLSAgICAgICAgaWYgcmF3X25h bWUgaXMgJ2ludGVnZXInOgorICAgICAgICBpZiByYXdfbmFtZSA9PSAnaW50ZWdlcic6CiAgICAg ICAgICAgICByZXR1cm4gJ2ludCcKLSAgICAgICAgaWYgcmF3X25hbWUgaXMgJ251bWJlcic6Cisg ICAgICAgIGlmIHJhd19uYW1lID09ICdudW1iZXInOgogICAgICAgICAgICAgcmV0dXJuICdkb3Vi bGUnCi0gICAgICAgIGlmIHJhd19uYW1lIGlzICdib29sZWFuJzoKKyAgICAgICAgaWYgcmF3X25h bWUgPT0gJ2Jvb2xlYW4nOgogICAgICAgICAgICAgcmV0dXJuICdCT09MJwogICAgICAgICBpZiBy YXdfbmFtZSBpbiBbJ2FueScsICdvYmplY3QnXToKICAgICAgICAgICAgIHJldHVybiAnJXNKU09O T2JqZWN0IConICUgT2JqQ0dlbmVyYXRvci5PQkpDX1NUQVRJQ19QUkVGSVgKQEAgLTIyOCw5ICsy MjgsOSBAQCBjbGFzcyBPYmpDR2VuZXJhdG9yKEdlbmVyYXRvcik6CiAKICAgICBAc3RhdGljbWV0 aG9kCiAgICAgZGVmIG9iamNfY2xhc3NfZm9yX3Jhd19uYW1lKHJhd19uYW1lKToKLSAgICAgICAg aWYgcmF3X25hbWUgaXMgJ3N0cmluZyc6CisgICAgICAgIGlmIHJhd19uYW1lID09ICdzdHJpbmcn OgogICAgICAgICAgICAgcmV0dXJuICdOU1N0cmluZycKLSAgICAgICAgaWYgcmF3X25hbWUgaXMg J2FycmF5JzoKKyAgICAgICAgaWYgcmF3X25hbWUgPT0gJ2FycmF5JzoKICAgICAgICAgICAgIHJl dHVybiAnTlNBcnJheScKICAgICAgICAgaWYgcmF3X25hbWUgaW4gWydpbnRlZ2VyJywgJ251bWJl cicsICdib29sZWFuJ106CiAgICAgICAgICAgICByZXR1cm4gJ05TTnVtYmVyJwpAQCAtMjQyLDEz ICsyNDIsMTMgQEAgY2xhc3MgT2JqQ0dlbmVyYXRvcihHZW5lcmF0b3IpOgogCiAgICAgQHN0YXRp Y21ldGhvZAogICAgIGRlZiBwcm90b2NvbF90eXBlX2Zvcl9yYXdfbmFtZShyYXdfbmFtZSk6Ci0g ICAgICAgIGlmIHJhd19uYW1lIGlzICdzdHJpbmcnOgorICAgICAgICBpZiByYXdfbmFtZSA9PSAn c3RyaW5nJzoKICAgICAgICAgICAgIHJldHVybiAnU3RyaW5nJwotICAgICAgICBpZiByYXdfbmFt ZSBpcyAnaW50ZWdlcic6CisgICAgICAgIGlmIHJhd19uYW1lID09ICdpbnRlZ2VyJzoKICAgICAg ICAgICAgIHJldHVybiAnaW50JwotICAgICAgICBpZiByYXdfbmFtZSBpcyAnbnVtYmVyJzoKKyAg ICAgICAgaWYgcmF3X25hbWUgPT0gJ251bWJlcic6CiAgICAgICAgICAgICByZXR1cm4gJ2RvdWJs ZScKLSAgICAgICAgaWYgcmF3X25hbWUgaXMgJ2Jvb2xlYW4nOgorICAgICAgICBpZiByYXdfbmFt ZSA9PSAnYm9vbGVhbic6CiAgICAgICAgICAgICByZXR1cm4gJ2Jvb2wnCiAgICAgICAgIGlmIHJh d19uYW1lIGluIFsnYW55JywgJ29iamVjdCddOgogICAgICAgICAgICAgcmV0dXJuICdKU09OOjpP YmplY3QnCkBAIC0zNzQsMTggKzM3NCwxOCBAQCBjbGFzcyBPYmpDR2VuZXJhdG9yKEdlbmVyYXRv cik6CiAgICAgICAgICAgICBpZiBpc2luc3RhbmNlKHZhcl90eXBlLCBFbnVtVHlwZSk6CiAgICAg ICAgICAgICAgICAgcmV0dXJuICd0b1Byb3RvY29sU3RyaW5nKCVzKScgJSB2YXJfbmFtZQogICAg ICAgICAgICAgcmV0dXJuIHZhcl9uYW1lCi0gICAgICAgIGlmIGNhdGVnb3J5IGlzIE9iakNUeXBl Q2F0ZWdvcnkuT2JqZWN0OgorICAgICAgICBpZiBjYXRlZ29yeSA9PSBPYmpDVHlwZUNhdGVnb3J5 Lk9iamVjdDoKICAgICAgICAgICAgIHJldHVybiAnWyVzIHRvSlNPTk9iamVjdF0nICUgdmFyX25h bWUKLSAgICAgICAgaWYgY2F0ZWdvcnkgaXMgT2JqQ1R5cGVDYXRlZ29yeS5BcnJheToKKyAgICAg ICAgaWYgY2F0ZWdvcnkgPT0gT2JqQ1R5cGVDYXRlZ29yeS5BcnJheToKICAgICAgICAgICAgIHBy b3RvY29sX3R5cGUgPSBPYmpDR2VuZXJhdG9yLnByb3RvY29sX3R5cGVfZm9yX3R5cGUodmFyX3R5 cGUuZWxlbWVudF90eXBlKQogICAgICAgICAgICAgb2JqY19jbGFzcyA9IHNlbGYub2JqY19jbGFz c19mb3JfdHlwZSh2YXJfdHlwZS5lbGVtZW50X3R5cGUpCiAgICAgICAgICAgICBpZiBwcm90b2Nv bF90eXBlID09ICdKU09OOjpBcnJheU9mPFN0cmluZz4nOgogICAgICAgICAgICAgICAgIHJldHVy biAndG9KU09OU3RyaW5nQXJyYXlBcnJheSglcyknICUgdmFyX25hbWUKLSAgICAgICAgICAgIGlm IHByb3RvY29sX3R5cGUgaXMgJ1N0cmluZycgYW5kIG9iamNfY2xhc3MgaXMgJ05TU3RyaW5nJzoK KyAgICAgICAgICAgIGlmIHByb3RvY29sX3R5cGUgPT0gJ1N0cmluZycgYW5kIG9iamNfY2xhc3Mg PT0gJ05TU3RyaW5nJzoKICAgICAgICAgICAgICAgICByZXR1cm4gJ3RvSlNPTlN0cmluZ0FycmF5 KCVzKScgJSB2YXJfbmFtZQotICAgICAgICAgICAgaWYgcHJvdG9jb2xfdHlwZSBpcyAnaW50JyBh bmQgb2JqY19jbGFzcyBpcyAnTlNOdW1iZXInOgorICAgICAgICAgICAgaWYgcHJvdG9jb2xfdHlw ZSA9PSAnaW50JyBhbmQgb2JqY19jbGFzcyA9PSAnTlNOdW1iZXInOgogICAgICAgICAgICAgICAg IHJldHVybiAndG9KU09OSW50ZWdlckFycmF5KCVzKScgJSB2YXJfbmFtZQotICAgICAgICAgICAg aWYgcHJvdG9jb2xfdHlwZSBpcyAnZG91YmxlJyBhbmQgb2JqY19jbGFzcyBpcyAnTlNOdW1iZXIn OgorICAgICAgICAgICAgaWYgcHJvdG9jb2xfdHlwZSA9PSAnZG91YmxlJyBhbmQgb2JqY19jbGFz cyA9PSAnTlNOdW1iZXInOgogICAgICAgICAgICAgICAgIHJldHVybiAndG9KU09ORG91YmxlQXJy YXkoJXMpJyAlIHZhcl9uYW1lCiAgICAgICAgICAgICByZXR1cm4gJ3RvSlNPTk9iamVjdEFycmF5 KCVzKScgJSB2YXJfbmFtZQogCkBAIC00MDcsMTQgKzQwNywxNCBAQCBjbGFzcyBPYmpDR2VuZXJh dG9yKEdlbmVyYXRvcik6CiAgICAgICAgIGNhdGVnb3J5ID0gT2JqQ1R5cGVDYXRlZ29yeS5jYXRl Z29yeV9mb3JfdHlwZSh2YXJfdHlwZSkKICAgICAgICAgaWYgY2F0ZWdvcnkgaW4gW09iakNUeXBl Q2F0ZWdvcnkuU2ltcGxlLCBPYmpDVHlwZUNhdGVnb3J5LlN0cmluZ106CiAgICAgICAgICAgICBy ZXR1cm4gdmFyX25hbWUKLSAgICAgICAgaWYgY2F0ZWdvcnkgaXMgT2JqQ1R5cGVDYXRlZ29yeS5P YmplY3Q6CisgICAgICAgIGlmIGNhdGVnb3J5ID09IE9iakNUeXBlQ2F0ZWdvcnkuT2JqZWN0Ogog ICAgICAgICAgICAgb2JqY19jbGFzcyA9IHNlbGYub2JqY19jbGFzc19mb3JfdHlwZSh2YXJfdHlw ZSkKICAgICAgICAgICAgIHJldHVybiAnW1tbJXMgYWxsb2NdIGluaXRXaXRoSlNPTk9iamVjdDol c10gYXV0b3JlbGVhc2VdJyAlIChvYmpjX2NsYXNzLCB2YXJfbmFtZSkKLSAgICAgICAgaWYgY2F0 ZWdvcnkgaXMgT2JqQ1R5cGVDYXRlZ29yeS5BcnJheToKKyAgICAgICAgaWYgY2F0ZWdvcnkgPT0g T2JqQ1R5cGVDYXRlZ29yeS5BcnJheToKICAgICAgICAgICAgIG9iamNfY2xhc3MgPSBzZWxmLm9i amNfY2xhc3NfZm9yX3R5cGUodmFyX3R5cGUuZWxlbWVudF90eXBlKQotICAgICAgICAgICAgaWYg b2JqY19jbGFzcyBpcyAnTlNTdHJpbmcnOgorICAgICAgICAgICAgaWYgb2JqY19jbGFzcyA9PSAn TlNTdHJpbmcnOgogICAgICAgICAgICAgICAgIHJldHVybiAndG9PYmpDU3RyaW5nQXJyYXkoJXMp JyAlIHZhcl9uYW1lCi0gICAgICAgICAgICBpZiBvYmpjX2NsYXNzIGlzICdOU051bWJlcic6ICAj IEZJWE1FOiBJbnRlZ2VyIG9yIERvdWJsZT8KKyAgICAgICAgICAgIGlmIG9iamNfY2xhc3MgPT0g J05TTnVtYmVyJzogICMgRklYTUU6IEludGVnZXIgb3IgRG91YmxlPwogICAgICAgICAgICAgICAg IHJldHVybiAndG9PYmpDSW50ZWdlckFycmF5KCVzKScgJSB2YXJfbmFtZQogICAgICAgICAgICAg cmV0dXJuICd0b09iakNBcnJheTwlcz4oJXMpJyAlIChvYmpjX2NsYXNzLCB2YXJfbmFtZSkKIApA QCAtNDI4LDE1ICs0MjgsMTUgQEAgY2xhc3MgT2JqQ0dlbmVyYXRvcihHZW5lcmF0b3IpOgogICAg ICAgICAgICAgaWYgaXNpbnN0YW5jZShtZW1iZXIudHlwZSwgRW51bVR5cGUpOgogICAgICAgICAg ICAgICAgIHJldHVybiAndG9Qcm90b2NvbFN0cmluZyglcyknICUgc3ViX2V4cHJlc3Npb24KICAg ICAgICAgICAgIHJldHVybiBzdWJfZXhwcmVzc2lvbgotICAgICAgICBpZiBjYXRlZ29yeSBpcyBP YmpDVHlwZUNhdGVnb3J5Lk9iamVjdDoKKyAgICAgICAgaWYgY2F0ZWdvcnkgPT0gT2JqQ1R5cGVD YXRlZ29yeS5PYmplY3Q6CiAgICAgICAgICAgICByZXR1cm4gc3ViX2V4cHJlc3Npb24KLSAgICAg ICAgaWYgY2F0ZWdvcnkgaXMgT2JqQ1R5cGVDYXRlZ29yeS5BcnJheToKKyAgICAgICAgaWYgY2F0 ZWdvcnkgPT0gT2JqQ1R5cGVDYXRlZ29yeS5BcnJheToKICAgICAgICAgICAgIG9iamNfY2xhc3Mg PSBzZWxmLm9iamNfY2xhc3NfZm9yX3R5cGUobWVtYmVyLnR5cGUuZWxlbWVudF90eXBlKQotICAg ICAgICAgICAgaWYgb2JqY19jbGFzcyBpcyAnTlNTdHJpbmcnOgorICAgICAgICAgICAgaWYgb2Jq Y19jbGFzcyA9PSAnTlNTdHJpbmcnOgogICAgICAgICAgICAgICAgIHJldHVybiAndG9KU09OU3Ry aW5nQXJyYXkoJXMpJyAlIHN1Yl9leHByZXNzaW9uCi0gICAgICAgICAgICBpZiBvYmpjX2NsYXNz IGlzICdOU051bWJlcic6CisgICAgICAgICAgICBpZiBvYmpjX2NsYXNzID09ICdOU051bWJlcic6 CiAgICAgICAgICAgICAgICAgcHJvdG9jb2xfdHlwZSA9IE9iakNHZW5lcmF0b3IucHJvdG9jb2xf dHlwZV9mb3JfdHlwZShtZW1iZXIudHlwZS5lbGVtZW50X3R5cGUpCi0gICAgICAgICAgICAgICAg aWYgcHJvdG9jb2xfdHlwZSBpcyAnZG91YmxlJzoKKyAgICAgICAgICAgICAgICBpZiBwcm90b2Nv bF90eXBlID09ICdkb3VibGUnOgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gJ3RvSlNPTkRv dWJsZUFycmF5KCVzKScgJSBzdWJfZXhwcmVzc2lvbgogICAgICAgICAgICAgICAgIHJldHVybiAn dG9KU09OSW50ZWdlckFycmF5KCVzKScgJSBzdWJfZXhwcmVzc2lvbgogICAgICAgICAgICAgcmV0 dXJuICd0b0pTT05PYmplY3RBcnJheSglcyknICUgc3ViX2V4cHJlc3Npb24KQEAgLTQ0OSwxNiAr NDQ5LDE2IEBAIGNsYXNzIE9iakNHZW5lcmF0b3IoR2VuZXJhdG9yKToKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuICdmcm9tUHJvdG9jb2xTdHJpbmc8JXM+KCVzKS52YWx1ZSgpJyAlIChzZWxm Lm9iamNfZW51bV9uYW1lX2Zvcl9hbm9ueW1vdXNfZW51bV9tZW1iZXIoZGVjbGFyYXRpb24sIG1l bWJlciksIHN1Yl9leHByZXNzaW9uKQogICAgICAgICAgICAgICAgIHJldHVybiAnZnJvbVByb3Rv Y29sU3RyaW5nPCVzPiglcykudmFsdWUoKScgJSAoc2VsZi5vYmpjX2VudW1fbmFtZV9mb3Jfbm9u X2Fub255bW91c19lbnVtKG1lbWJlci50eXBlKSwgc3ViX2V4cHJlc3Npb24pCiAgICAgICAgICAg ICByZXR1cm4gc3ViX2V4cHJlc3Npb24KLSAgICAgICAgaWYgY2F0ZWdvcnkgaXMgT2JqQ1R5cGVD YXRlZ29yeS5PYmplY3Q6CisgICAgICAgIGlmIGNhdGVnb3J5ID09IE9iakNUeXBlQ2F0ZWdvcnku T2JqZWN0OgogICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJwcm90b2NvbF90b19vYmpjX2V4 cHJlc3Npb25fZm9yX21lbWJlciBkb2VzIG5vdCBzdXBwb3J0IGFuIE9iamVjdCB0eXBlLiBTZWU6 IHByb3RvY29sX3RvX29iamNfY29kZV9ibG9ja19mb3Jfb2JqZWN0X21lbWJlciIpCi0gICAgICAg IGlmIGNhdGVnb3J5IGlzIE9iakNUeXBlQ2F0ZWdvcnkuQXJyYXk6CisgICAgICAgIGlmIGNhdGVn b3J5ID09IE9iakNUeXBlQ2F0ZWdvcnkuQXJyYXk6CiAgICAgICAgICAgICBwcm90b2NvbF90eXBl ID0gT2JqQ0dlbmVyYXRvci5wcm90b2NvbF90eXBlX2Zvcl90eXBlKG1lbWJlci50eXBlLmVsZW1l bnRfdHlwZSkKICAgICAgICAgICAgIG9iamNfY2xhc3MgPSBzZWxmLm9iamNfY2xhc3NfZm9yX3R5 cGUobWVtYmVyLnR5cGUuZWxlbWVudF90eXBlKQotICAgICAgICAgICAgaWYgb2JqY19jbGFzcyBp cyAnTlNTdHJpbmcnOgorICAgICAgICAgICAgaWYgb2JqY19jbGFzcyA9PSAnTlNTdHJpbmcnOgog ICAgICAgICAgICAgICAgIHJldHVybiAndG9PYmpDU3RyaW5nQXJyYXkoJXMpJyAlIHN1Yl9leHBy ZXNzaW9uCi0gICAgICAgICAgICBpZiBvYmpjX2NsYXNzIGlzICdOU051bWJlcic6CisgICAgICAg ICAgICBpZiBvYmpjX2NsYXNzID09ICdOU051bWJlcic6CiAgICAgICAgICAgICAgICAgcHJvdG9j b2xfdHlwZSA9IE9iakNHZW5lcmF0b3IucHJvdG9jb2xfdHlwZV9mb3JfdHlwZShtZW1iZXIudHlw ZS5lbGVtZW50X3R5cGUpCi0gICAgICAgICAgICAgICAgaWYgcHJvdG9jb2xfdHlwZSBpcyAnZG91 YmxlJzoKKyAgICAgICAgICAgICAgICBpZiBwcm90b2NvbF90eXBlID09ICdkb3VibGUnOgogICAg ICAgICAgICAgICAgICAgICByZXR1cm4gJ3RvT2JqQ0RvdWJsZUFycmF5KCVzKScgJSBzdWJfZXhw cmVzc2lvbgogICAgICAgICAgICAgICAgIHJldHVybiAndG9PYmpDSW50ZWdlckFycmF5KCVzKScg JSBzdWJfZXhwcmVzc2lvbgogICAgICAgICAgICAgcmV0dXJuICd0b09iakNBcnJheTwlcz4oJXMp JyAlIChvYmpjX2NsYXNzLCBzdWJfZXhwcmVzc2lvbikKQEAgLTQ3OSwxMSArNDc5LDExIEBAIGNs YXNzIE9iakNHZW5lcmF0b3IoR2VuZXJhdG9yKToKICAgICAgICAgaWYgaXNpbnN0YW5jZShfdHlw ZSwgUHJpbWl0aXZlVHlwZSk6CiAgICAgICAgICAgICBzdWJfZXhwcmVzc2lvbiA9ICdwYXlsb2Fk W0AiJXMiXScgJSBtZW1iZXIubWVtYmVyX25hbWUKICAgICAgICAgICAgIHJhd19uYW1lID0gX3R5 cGUucmF3X25hbWUoKQotICAgICAgICAgICAgaWYgcmF3X25hbWUgaXMgJ2Jvb2xlYW4nOgorICAg ICAgICAgICAgaWYgcmF3X25hbWUgPT0gJ2Jvb2xlYW4nOgogICAgICAgICAgICAgICAgIHJldHVy biAnWyVzIGJvb2xWYWx1ZV0nICUgc3ViX2V4cHJlc3Npb24KLSAgICAgICAgICAgIGlmIHJhd19u YW1lIGlzICdpbnRlZ2VyJzoKKyAgICAgICAgICAgIGlmIHJhd19uYW1lID09ICdpbnRlZ2VyJzoK ICAgICAgICAgICAgICAgICByZXR1cm4gJ1slcyBpbnRlZ2VyVmFsdWVdJyAlIHN1Yl9leHByZXNz aW9uCi0gICAgICAgICAgICBpZiByYXdfbmFtZSBpcyAnbnVtYmVyJzoKKyAgICAgICAgICAgIGlm IHJhd19uYW1lID09ICdudW1iZXInOgogICAgICAgICAgICAgICAgIHJldHVybiAnWyVzIGRvdWJs ZVZhbHVlXScgJSBzdWJfZXhwcmVzc2lvbgogICAgICAgICAgICAgaWYgcmF3X25hbWUgaW4gWydh bnknLCAnb2JqZWN0JywgJ2FycmF5JywgJ3N0cmluZyddOgogICAgICAgICAgICAgICAgIHJldHVy biBzdWJfZXhwcmVzc2lvbiAgIyBUaGUgc2V0dGVyIHdpbGwgY2hlY2sgdGhlIGluY29taW5nIHZh bHVlLgpAQCAtNTIxLDE3ICs1MjEsMTcgQEAgY2xhc3MgT2JqQ0dlbmVyYXRvcihHZW5lcmF0b3Ip OgogICAgICAgICAgICAgX3R5cGUgPSBfdHlwZS5hbGlhc2VkX3R5cGUKICAgICAgICAgaWYgKGlz aW5zdGFuY2UoX3R5cGUsIFByaW1pdGl2ZVR5cGUpKToKICAgICAgICAgICAgIHJhd19uYW1lID0g X3R5cGUucmF3X25hbWUoKQotICAgICAgICAgICAgaWYgcmF3X25hbWUgaXMgJ2Jvb2xlYW4nOgor ICAgICAgICAgICAgaWYgcmF3X25hbWUgPT0gJ2Jvb2xlYW4nOgogICAgICAgICAgICAgICAgIHJl dHVybiAnc2V0Qm9vbCcKLSAgICAgICAgICAgIGlmIHJhd19uYW1lIGlzICdpbnRlZ2VyJzoKKyAg ICAgICAgICAgIGlmIHJhd19uYW1lID09ICdpbnRlZ2VyJzoKICAgICAgICAgICAgICAgICByZXR1 cm4gJ3NldEludGVnZXInCi0gICAgICAgICAgICBpZiByYXdfbmFtZSBpcyAnbnVtYmVyJzoKKyAg ICAgICAgICAgIGlmIHJhd19uYW1lID09ICdudW1iZXInOgogICAgICAgICAgICAgICAgIHJldHVy biAnc2V0RG91YmxlJwotICAgICAgICAgICAgaWYgcmF3X25hbWUgaXMgJ3N0cmluZyc6CisgICAg ICAgICAgICBpZiByYXdfbmFtZSA9PSAnc3RyaW5nJzoKICAgICAgICAgICAgICAgICByZXR1cm4g J3NldFN0cmluZycKICAgICAgICAgICAgIGlmIHJhd19uYW1lIGluIFsnYW55JywgJ29iamVjdCdd OgogICAgICAgICAgICAgICAgIHJldHVybiAnc2V0T2JqZWN0JwotICAgICAgICAgICAgaWYgcmF3 X25hbWUgaXMgJ2FycmF5JzoKKyAgICAgICAgICAgIGlmIHJhd19uYW1lID09ICdhcnJheSc6CiAg ICAgICAgICAgICAgICAgcmV0dXJuICdzZXRKU09OQXJyYXknCiAgICAgICAgICAgICByZXR1cm4g Tm9uZQogICAgICAgICBpZiAoaXNpbnN0YW5jZShfdHlwZSwgRW51bVR5cGUpKToKQEAgLTU1Miwx NyArNTUyLDE3IEBAIGNsYXNzIE9iakNHZW5lcmF0b3IoR2VuZXJhdG9yKToKICAgICAgICAgICAg IF90eXBlID0gX3R5cGUuYWxpYXNlZF90eXBlCiAgICAgICAgIGlmIChpc2luc3RhbmNlKF90eXBl LCBQcmltaXRpdmVUeXBlKSk6CiAgICAgICAgICAgICByYXdfbmFtZSA9IF90eXBlLnJhd19uYW1l KCkKLSAgICAgICAgICAgIGlmIHJhd19uYW1lIGlzICdib29sZWFuJzoKKyAgICAgICAgICAgIGlm IHJhd19uYW1lID09ICdib29sZWFuJzoKICAgICAgICAgICAgICAgICByZXR1cm4gJ2Jvb2xGb3JL ZXknCi0gICAgICAgICAgICBpZiByYXdfbmFtZSBpcyAnaW50ZWdlcic6CisgICAgICAgICAgICBp ZiByYXdfbmFtZSA9PSAnaW50ZWdlcic6CiAgICAgICAgICAgICAgICAgcmV0dXJuICdpbnRlZ2Vy Rm9yS2V5JwotICAgICAgICAgICAgaWYgcmF3X25hbWUgaXMgJ251bWJlcic6CisgICAgICAgICAg ICBpZiByYXdfbmFtZSA9PSAnbnVtYmVyJzoKICAgICAgICAgICAgICAgICByZXR1cm4gJ2RvdWJs ZUZvcktleScKLSAgICAgICAgICAgIGlmIHJhd19uYW1lIGlzICdzdHJpbmcnOgorICAgICAgICAg ICAgaWYgcmF3X25hbWUgPT0gJ3N0cmluZyc6CiAgICAgICAgICAgICAgICAgcmV0dXJuICdzdHJp bmdGb3JLZXknCiAgICAgICAgICAgICBpZiByYXdfbmFtZSBpbiBbJ2FueScsICdvYmplY3QnXToK ICAgICAgICAgICAgICAgICByZXR1cm4gJ29iamVjdEZvcktleScKLSAgICAgICAgICAgIGlmIHJh d19uYW1lIGlzICdhcnJheSc6CisgICAgICAgICAgICBpZiByYXdfbmFtZSA9PSAnYXJyYXknOgog ICAgICAgICAgICAgICAgIHJldHVybiAnSlNPTkFycmF5Rm9yS2V5JwogICAgICAgICAgICAgcmV0 dXJuIE5vbmUKICAgICAgICAgaWYgKGlzaW5zdGFuY2UoX3R5cGUsIEVudW1UeXBlKSk6Cg==