From: Wei Liu Subject: [PATCH for-next RFC 3/4] pygrub: convert python files with 2to3 Date: Tue, 5 Mar 2019 16:42:05 +0000 Message-ID: <20190305164206.6793-4-wei.liu2@citrix.com> References: <20190305164206.6793-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h1D91-0008M2-KJ for xen-devel@lists.xenproject.org; Tue, 05 Mar 2019 16:42:19 +0000 In-Reply-To: <20190305164206.6793-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: George Dunlap , Anthony PERARD , Ian Jackson , Wei Liu , Andrew Cooper List-Id: xen-devel@lists.xenproject.org U2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCk5vdCBzdXJl IHRoaXMgd29ya3Mgd2l0aCBweXRob24gMi40LCBidXQgaXQgc2hvdWxkIHdvcmsgd2l0aCAyLjcg c2luY2UKdGhlIGNoYW5nZXMgbG9vayBtb3JlIG9yIGxlc3MgaW4gdGhlIHNhbWUgdmVpbiBhcyB0 aGUgY2hhbmdlcyBpbgpsaWJ4bC4KClRoZSBjb252ZXJzaW9uIG9mIHRoZSBpbXBvcnQgaXMgaW50 ZXJlc3RpbmcuIFRoaXMgZGVmaW5pdGVseSBuZWVkcwpzb21lIHRlc3RpbmcuCi0tLQogdG9vbHMv cHlncnViL3NyYy9FeHRMaW51eENvbmYucHkgfCAxNiArKysrKysrKy0tLS0tLS0tCiB0b29scy9w eWdydWIvc3JjL0dydWJDb25mLnB5ICAgICB8IDM2ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLQogdG9vbHMvcHlncnViL3NyYy9MaWxvQ29uZi5weSAgICAgfCAxNiArKysrKysr Ky0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3B5Z3J1Yi9zcmMvRXh0TGludXhDb25mLnB5IGIvdG9v bHMvcHlncnViL3NyYy9FeHRMaW51eENvbmYucHkKaW5kZXggZDE3ODliZjAyMC4uNjBkYTk2MGM0 YiAxMDA2NDQKLS0tIGEvdG9vbHMvcHlncnViL3NyYy9FeHRMaW51eENvbmYucHkKKysrIGIvdG9v bHMvcHlncnViL3NyYy9FeHRMaW51eENvbmYucHkKQEAgLTEyLDcgKzEyLDcgQEAKIAogaW1wb3J0 IHN5cywgcmUsIG9zCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IEdydWJDb25mCitmcm9tIC4gaW1w b3J0IEdydWJDb25mCiAKIGNsYXNzIEV4dExpbnV4SW1hZ2Uob2JqZWN0KToKICAgICBkZWYgX19p bml0X18oc2VsZiwgbGluZXMsIHBhdGgpOgpAQCAtMzIsNyArMzIsNyBAQCBjbGFzcyBFeHRMaW51 eEltYWdlKG9iamVjdCk6CiAgICAgICAgIHNlbGYubGluZXMgPSBbXQogICAgICAgICBzZWxmLnBh dGggPSBwYXRoCiAgICAgICAgIHNlbGYucm9vdCA9ICIiCi0gICAgICAgIG1hcChzZWxmLnNldF9m cm9tX2xpbmUsIGxpbmVzKQorICAgICAgICBsaXN0KG1hcChzZWxmLnNldF9mcm9tX2xpbmUsIGxp bmVzKSkKIAogICAgIGRlZiBzZXRfZnJvbV9saW5lKHNlbGYsIGxpbmUsIHJlcGxhY2UgPSBOb25l KToKICAgICAgICAgKGNvbSwgYXJnKSA9IEdydWJDb25mLmdydWJfZXhhY3Rfc3BsaXQobGluZSwg MikKQEAgLTY3LDcgKzY3LDcgQEAgY2xhc3MgRXh0TGludXhJbWFnZShvYmplY3QpOgogICAgICAg ICAgICAgICAgICAgICAgICAgc2V0YXR0cihzZWxmLCAiaW5pdHJkIiwgYS5yZXBsYWNlKCJpbml0 cmQ9IiwgIiIpKQogICAgICAgICAgICAgICAgICAgICAgICAgYXJnID0gYXJnLnJlcGxhY2UoYSwg IiIpCiAKLSAgICAgICAgaWYgY29tIGlzIG5vdCBOb25lIGFuZCBzZWxmLmNvbW1hbmRzLmhhc19r ZXkoY29tKToKKyAgICAgICAgaWYgY29tIGlzIG5vdCBOb25lIGFuZCBjb20gaW4gc2VsZi5jb21t YW5kczoKICAgICAgICAgICAgIGlmIHNlbGYuY29tbWFuZHNbY29tXSBpcyBub3QgTm9uZToKICAg ICAgICAgICAgICAgICBzZXRhdHRyKHNlbGYsIHNlbGYuY29tbWFuZHNbY29tXSwgcmUuc3ViKCde IiguKykiJCcsIHIiXDEiLCBhcmcuc3RyaXAoKSkpCiAgICAgICAgICAgICBlbHNlOgpAQCAtMTM2 LDcgKzEzNiw3IEBAIGNsYXNzIEV4dExpbnV4Q29uZmlnRmlsZShvYmplY3QpOgogICAgIGRlZiBw YXJzZShzZWxmLCBidWYgPSBOb25lKToKICAgICAgICAgaWYgYnVmIGlzIE5vbmU6CiAgICAgICAg ICAgICBpZiBzZWxmLmZpbGVuYW1lIGlzIE5vbmU6Ci0gICAgICAgICAgICAgICAgcmFpc2UgVmFs dWVFcnJvciwgIk5vIGNvbmZpZyBmaWxlIGRlZmluZWQgdG8gcGFyc2UhIgorICAgICAgICAgICAg ICAgIHJhaXNlIFZhbHVlRXJyb3IoIk5vIGNvbmZpZyBmaWxlIGRlZmluZWQgdG8gcGFyc2UhIikK IAogICAgICAgICAgICAgZiA9IG9wZW4oc2VsZi5maWxlbmFtZSwgJ3InKQogICAgICAgICAgICAg bGluZXMgPSBmLnJlYWRsaW5lcygpCkBAIC0xNjcsNyArMTY3LDcgQEAgY2xhc3MgRXh0TGludXhD b25maWdGaWxlKG9iamVjdCk6CiAKICAgICAgICAgICAgIChjb20sIGFyZykgPSBHcnViQ29uZi5n cnViX2V4YWN0X3NwbGl0KGwsIDIpCiAgICAgICAgICAgICBjb20gPSBjb20ubG93ZXIoKQotICAg ICAgICAgICAgaWYgc2VsZi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAgICAgICAgICBpZiBj b20gaW4gc2VsZi5jb21tYW5kczoKICAgICAgICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzW2Nv bV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwgc2VsZi5j b21tYW5kc1tjb21dLCBhcmcuc3RyaXAoKSkKICAgICAgICAgICAgICAgICBlbHNlOgpAQCAtMjA3 LDggKzIwNyw4IEBAIGNsYXNzIEV4dExpbnV4Q29uZmlnRmlsZShvYmplY3QpOgogICAgICAgICAK IGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgaWYgbGVuKHN5cy5hcmd2KSA8IDI6Ci0g ICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvciwgIk5lZWQgYSBjb25maWd1cmF0aW9uIGZpbGUgdG8g cmVhZCIKKyAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCJOZWVkIGEgY29uZmlndXJhdGlvbiBm aWxlIHRvIHJlYWQiKQogICAgIGcgPSBFeHRMaW51eENvbmZpZ0ZpbGUoc3lzLmFyZ3ZbMV0pCiAg ICAgZm9yIGkgaW4gZy5pbWFnZXM6Ci0gICAgICAgIHByaW50IGkKLSAgICBwcmludCBnLmRlZmF1 bHQKKyAgICAgICAgcHJpbnQoaSkKKyAgICBwcmludChnLmRlZmF1bHQpCmRpZmYgLS1naXQgYS90 b29scy9weWdydWIvc3JjL0dydWJDb25mLnB5IGIvdG9vbHMvcHlncnViL3NyYy9HcnViQ29uZi5w eQppbmRleCBkYzgxMGQ1NWNiLi4xN2Y2ZTY4NmNjIDEwMDY0NAotLS0gYS90b29scy9weWdydWIv c3JjL0dydWJDb25mLnB5CisrKyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvR3J1YkNvbmYucHkKQEAgLTQ0 LDcgKzQ0LDcgQEAgZGVmIGdldF9wYXRoKHMpOgogICAgICAgICByZXR1cm4gKE5vbmUsIHMpCiAg ICAgaWR4ID0gcy5maW5kKCcpJykKICAgICBpZiBpZHggPT0gLTE6Ci0gICAgICAgIHJhaXNlIFZh bHVlRXJyb3IsICJVbmFibGUgdG8gZmluZCBtYXRjaGluZyAnKSciCisgICAgICAgIHJhaXNlIFZh bHVlRXJyb3IoIlVuYWJsZSB0byBmaW5kIG1hdGNoaW5nICcpJyIpCiAgICAgZCA9IHNbOmlkeF0K ICAgICByZXR1cm4gKEdydWJEaXNrUGFydChkKSwgc1tpZHggKyAxOl0pCiAKQEAgLTEwMCw3ICsx MDAsNyBAQCBjbGFzcyBfR3J1YkltYWdlKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgIiAgaW5p dHJkOiAlc1xuIiAlKHNlbGYudGl0bGUsIHNlbGYucm9vdCwgc2VsZi5rZXJuZWwsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuYXJncywgc2VsZi5pbml0cmQpKQogICAg IGRlZiBfcGFyc2Uoc2VsZiwgbGluZXMpOgotICAgICAgICBtYXAoc2VsZi5zZXRfZnJvbV9saW5l LCBsaW5lcykKKyAgICAgICAgbGlzdChtYXAoc2VsZi5zZXRfZnJvbV9saW5lLCBsaW5lcykpCiAK ICAgICBkZWYgcmVzZXQoc2VsZiwgbGluZXMpOgogICAgICAgICBzZWxmLl9yb290ID0gc2VsZi5f aW5pdHJkID0gc2VsZi5fa2VybmVsID0gc2VsZi5fYXJncyA9IE5vbmUKQEAgLTE0MSw3ICsxNDEs NyBAQCBjbGFzcyBHcnViSW1hZ2UoX0dydWJJbWFnZSk6CiAgICAgZGVmIHNldF9mcm9tX2xpbmUo c2VsZiwgbGluZSwgcmVwbGFjZSA9IE5vbmUpOgogICAgICAgICAoY29tLCBhcmcpID0gZ3J1Yl9l eGFjdF9zcGxpdChsaW5lLCAyKQogCi0gICAgICAgIGlmIHNlbGYuY29tbWFuZHMuaGFzX2tleShj b20pOgorICAgICAgICBpZiBjb20gaW4gc2VsZi5jb21tYW5kczoKICAgICAgICAgICAgIGlmIHNl bGYuY29tbWFuZHNbY29tXSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICBzZXRhdHRyKHNl bGYsIHNlbGYuY29tbWFuZHNbY29tXSwgYXJnLnN0cmlwKCkpCiAgICAgICAgICAgICBlbHNlOgpA QCAtMTc3LDcgKzE3Nyw3IEBAIGNsYXNzIF9HcnViQ29uZmlnRmlsZShvYmplY3QpOgogICAgICAg ICAgICAgc2VsZi5wYXJzZSgpCiAKICAgICBkZWYgcGFyc2Uoc2VsZiwgYnVmID0gTm9uZSk6Ci0g ICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvciwgInVuaW1wbGVtZW50ZWQgcGFyc2UgZnVuY3Rpb24i ICAgCisgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigidW5pbXBsZW1lbnRlZCBwYXJzZSBmdW5j dGlvbiIpICAgCiAKICAgICBkZWYgaGFzUGFzc3dvcmRBY2Nlc3Moc2VsZik6CiAgICAgICAgIHJl dHVybiBzZWxmLnBhc3N3b3JkQWNjZXNzCkBAIC0yMDEsNyArMjAxLDcgQEAgY2xhc3MgX0dydWJD b25maWdGaWxlKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgaW1wb3J0IGNyeXB0CiAgICAgICAg ICAgICAgICAgaWYgY3J5cHQuY3J5cHQocGFzc3dvcmQsIHB3ZFsxXSkgPT0gcHdkWzFdOgogICAg ICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQotICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlv biwgZToKKyAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgICAg ICBzZWxmLnBhc3NFeGMgPSAiQ2FuJ3QgdmVyaWZ5IHBhc3N3b3JkOiAlcyIgJSBzdHIoZSkKICAg ICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIApAQCAtMjEzLDcgKzIxMyw3IEBAIGNsYXNzIF9H cnViQ29uZmlnRmlsZShvYmplY3QpOgogCiAgICAgZGVmIHNldChzZWxmLCBsaW5lKToKICAgICAg ICAgKGNvbSwgYXJnKSA9IGdydWJfZXhhY3Rfc3BsaXQobGluZSwgMikKLSAgICAgICAgaWYgc2Vs Zi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAgICAgIGlmIGNvbSBpbiBzZWxmLmNvbW1hbmRz OgogICAgICAgICAgICAgaWYgc2VsZi5jb21tYW5kc1tjb21dIGlzIG5vdCBOb25lOgogICAgICAg ICAgICAgICAgIHNldGF0dHIoc2VsZiwgc2VsZi5jb21tYW5kc1tjb21dLCBhcmcuc3RyaXAoKSkK ICAgICAgICAgICAgIGVsc2U6CkBAIC0yMzMsNyArMjMzLDcgQEAgY2xhc3MgX0dydWJDb25maWdG aWxlKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9kZWZhdWx0ID0gdmFsCiAKICAgICAgICAg aWYgc2VsZi5fZGVmYXVsdCA8IDA6Ci0gICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yLCAiZGVm YXVsdCBtdXN0IGJlIHBvc2l0aXZlIG51bWJlciIKKyAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJy b3IoImRlZmF1bHQgbXVzdCBiZSBwb3NpdGl2ZSBudW1iZXIiKQogICAgIGRlZmF1bHQgPSBwcm9w ZXJ0eShfZ2V0X2RlZmF1bHQsIF9zZXRfZGVmYXVsdCkKIAogICAgIGRlZiBzZXRfc3BsYXNoKHNl bGYsIHZhbCk6CkBAIC0yNjUsNyArMjY1LDcgQEAgY2xhc3MgR3J1YkNvbmZpZ0ZpbGUoX0dydWJD b25maWdGaWxlKToKICAgICBkZWYgcGFyc2Uoc2VsZiwgYnVmID0gTm9uZSk6CiAgICAgICAgIGlm IGJ1ZiBpcyBOb25lOgogICAgICAgICAgICAgaWYgc2VsZi5maWxlbmFtZSBpcyBOb25lOgotICAg ICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IsICJObyBjb25maWcgZmlsZSBkZWZpbmVkIHRv IHBhcnNlISIKKyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJObyBjb25maWcgZmls ZSBkZWZpbmVkIHRvIHBhcnNlISIpCiAKICAgICAgICAgICAgIGYgPSBvcGVuKHNlbGYuZmlsZW5h bWUsICdyJykKICAgICAgICAgICAgIGxpbmVzID0gZi5yZWFkbGluZXMoKQpAQCAtMjk2LDcgKzI5 Niw3IEBAIGNsYXNzIEdydWJDb25maWdGaWxlKF9HcnViQ29uZmlnRmlsZSk6CiAgICAgICAgICAg ICAgICAgY29udGludWUKIAogICAgICAgICAgICAgKGNvbSwgYXJnKSA9IGdydWJfZXhhY3Rfc3Bs aXQobCwgMikKLSAgICAgICAgICAgIGlmIHNlbGYuY29tbWFuZHMuaGFzX2tleShjb20pOgorICAg ICAgICAgICAgaWYgY29tIGluIHNlbGYuY29tbWFuZHM6CiAgICAgICAgICAgICAgICAgaWYgc2Vs Zi5jb21tYW5kc1tjb21dIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgICAgICAgICBzZXRhdHRy KHNlbGYsIHNlbGYuY29tbWFuZHNbY29tXSwgYXJnLnN0cmlwKCkpCiAgICAgICAgICAgICAgICAg ZWxzZToKQEAgLTMyOCw3ICszMjgsNyBAQCBjbGFzcyBHcnViMkltYWdlKF9HcnViSW1hZ2UpOgog ICAgICAgICBpZiBjb20gPT0gInNldCI6CiAgICAgICAgICAgICAoY29tLGFyZykgPSBncnViMl9o YW5kbGVfc2V0KGFyZykKICAgICAgICAgICAgIAotICAgICAgICBpZiBzZWxmLmNvbW1hbmRzLmhh c19rZXkoY29tKToKKyAgICAgICAgaWYgY29tIGluIHNlbGYuY29tbWFuZHM6CiAgICAgICAgICAg ICBpZiBzZWxmLmNvbW1hbmRzW2NvbV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAgc2V0 YXR0cihzZWxmLCBzZWxmLmNvbW1hbmRzW2NvbV0sIGFyZy5zdHJpcCgpKQogICAgICAgICAgICAg ZWxzZToKQEAgLTM2NCw3ICszNjQsNyBAQCBjbGFzcyBHcnViMkNvbmZpZ0ZpbGUoX0dydWJDb25m aWdGaWxlKToKICAgICBkZWYgcGFyc2Uoc2VsZiwgYnVmID0gTm9uZSk6CiAgICAgICAgIGlmIGJ1 ZiBpcyBOb25lOgogICAgICAgICAgICAgaWYgc2VsZi5maWxlbmFtZSBpcyBOb25lOgotICAgICAg ICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IsICJObyBjb25maWcgZmlsZSBkZWZpbmVkIHRvIHBh cnNlISIKKyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJObyBjb25maWcgZmlsZSBk ZWZpbmVkIHRvIHBhcnNlISIpCiAKICAgICAgICAgICAgIGYgPSBvcGVuKHNlbGYuZmlsZW5hbWUs ICdyJykKICAgICAgICAgICAgIGxpbmVzID0gZi5yZWFkbGluZXMoKQpAQCAtMzk4LDcgKzM5OCw3 IEBAIGNsYXNzIEdydWIyQ29uZmlnRmlsZShfR3J1YkNvbmZpZ0ZpbGUpOgogICAgICAgICAgICAg dGl0bGVfbWF0Y2ggPSByZS5tYXRjaCgnXm1lbnVlbnRyeSBbIlwnXSguKj8pWyJcJ10gKC4qKXsn LCBsKQogICAgICAgICAgICAgaWYgdGl0bGVfbWF0Y2g6CiAgICAgICAgICAgICAgICAgaWYgaW1n IGlzIG5vdCBOb25lOgotICAgICAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJz eW50YXggZXJyb3I6IGNhbm5vdCBuZXN0IG1lbnVlbnRyeSAoJWQgJXMpIiAlIChsZW4oaW1nKSxp bWcpCisgICAgICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigic3ludGF4IGVycm9y OiBjYW5ub3QgbmVzdCBtZW51ZW50cnkgKCVkICVzKSIgJSAobGVuKGltZyksaW1nKSkKICAgICAg ICAgICAgICAgICBpbWcgPSBbXQogICAgICAgICAgICAgICAgIHRpdGxlID0gdGl0bGVfbWF0Y2gu Z3JvdXAoMSkKICAgICAgICAgICAgICAgICBjb250aW51ZQpAQCAtNDEzLDcgKzQxMyw3IEBAIGNs YXNzIEdydWIyQ29uZmlnRmlsZShfR3J1YkNvbmZpZ0ZpbGUpOgogICAgICAgICAgICAgICAgICAg ICAgICAgbWVudV9sZXZlbCAtPSAxCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZQog ICAgICAgICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICAgICAgcmFpc2Ug UnVudGltZUVycm9yLCAic3ludGF4IGVycm9yOiBjbG9zaW5nIGJyYWNlIHdpdGhvdXQgbWVudWVu dHJ5IgorICAgICAgICAgICAgICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCJzeW50YXgg ZXJyb3I6IGNsb3NpbmcgYnJhY2Ugd2l0aG91dCBtZW51ZW50cnkiKQogCiAgICAgICAgICAgICAg ICAgc2VsZi5hZGRfaW1hZ2UoR3J1YjJJbWFnZSh0aXRsZSwgaW1nKSkKICAgICAgICAgICAgICAg ICBpbWcgPSBOb25lCkBAIC00MjgsNyArNDI4LDcgQEAgY2xhc3MgR3J1YjJDb25maWdGaWxlKF9H cnViQ29uZmlnRmlsZSk6CiAgICAgICAgICAgICBpZiBjb20gPT0gInNldCI6CiAgICAgICAgICAg ICAgICAgKGNvbSxhcmcpID0gZ3J1YjJfaGFuZGxlX3NldChhcmcpCiAgICAgICAgICAgICAgICAg Ci0gICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzLmhhc19rZXkoY29tKToKKyAgICAgICAgICAg IGlmIGNvbSBpbiBzZWxmLmNvbW1hbmRzOgogICAgICAgICAgICAgICAgIGlmIHNlbGYuY29tbWFu ZHNbY29tXSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAgYXJnX3N0cmlwID0gYXJn LnN0cmlwKCkKICAgICAgICAgICAgICAgICAgICAgaWYgYXJnX3N0cmlwID09ICIke3NhdmVkX2Vu dHJ5fSIgb3IgYXJnX3N0cmlwID09ICIke25leHRfZW50cnl9IjoKQEAgLTQ0Myw3ICs0NDMsNyBA QCBjbGFzcyBHcnViMkNvbmZpZ0ZpbGUoX0dydWJDb25maWdGaWxlKToKICAgICAgICAgICAgICAg ICBsb2dnaW5nLndhcm5pbmcoIlVua25vd24gZGlyZWN0aXZlICVzIiAlKGNvbSwpKQogICAgICAg ICAgICAgCiAgICAgICAgIGlmIGltZyBpcyBub3QgTm9uZToKLSAgICAgICAgICAgIHJhaXNlIFJ1 bnRpbWVFcnJvciwgInN5bnRheCBlcnJvcjogZW5kIG9mIGZpbGUgd2l0aCBvcGVuIG1lbnVlbnRy eSglZCAlcykiICUgKGxlbihpbWcpLGltZykKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJv cigic3ludGF4IGVycm9yOiBlbmQgb2YgZmlsZSB3aXRoIG9wZW4gbWVudWVudHJ5KCVkICVzKSIg JSAobGVuKGltZyksaW1nKSkKIAogICAgICAgICBpZiBzZWxmLmhhc1Bhc3N3b3JkKCk6CiAgICAg ICAgICAgICBzZWxmLnNldFBhc3N3b3JkQWNjZXNzKEZhbHNlKQpAQCAtNDYyLDEyICs0NjIsMTIg QEAgY2xhc3MgR3J1YjJDb25maWdGaWxlKF9HcnViQ29uZmlnRmlsZSk6CiAgICAgICAgIAogaWYg X19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICBpZiBsZW4oc3lzLmFyZ3YpIDwgMzoKLSAgICAg ICAgcmFpc2UgUnVudGltZUVycm9yLCAiTmVlZCBhIGdydWIgdmVyc2lvbiAoXCJncnViXCIgb3Ig XCJncnViMlwiKSBhbmQgYSBncnViLmNvbmYgb3IgZ3J1Yi5jZmcgdG8gcmVhZCIKKyAgICAgICAg cmFpc2UgUnVudGltZUVycm9yKCJOZWVkIGEgZ3J1YiB2ZXJzaW9uIChcImdydWJcIiBvciBcImdy dWIyXCIpIGFuZCBhIGdydWIuY29uZiBvciBncnViLmNmZyB0byByZWFkIikKICAgICBpZiBzeXMu YXJndlsxXSA9PSAiZ3J1YiI6CiAgICAgICAgIGcgPSBHcnViQ29uZmlnRmlsZShzeXMuYXJndlsy XSkKICAgICBlbGlmIHN5cy5hcmd2WzFdID09ICJncnViMiI6CiAgICAgICAgIGcgPSBHcnViMkNv bmZpZ0ZpbGUoc3lzLmFyZ3ZbMl0pCiAgICAgZWxzZToKLSAgICAgICAgcmFpc2UgUnVudGltZUVy cm9yLCAiVW5rbm93biBjb25maWcgdHlwZSAlcyIgJSBzeXMuYXJndlsxXQorICAgICAgICByYWlz ZSBSdW50aW1lRXJyb3IoIlVua25vd24gY29uZmlnIHR5cGUgJXMiICUgc3lzLmFyZ3ZbMV0pCiAg ICAgZm9yIGkgaW4gZy5pbWFnZXM6Ci0gICAgICAgIHByaW50IGkgIywgaS50aXRsZSwgaS5yb290 LCBpLmtlcm5lbCwgaS5hcmdzLCBpLmluaXRyZAorICAgICAgICBwcmludChpKSAjLCBpLnRpdGxl LCBpLnJvb3QsIGkua2VybmVsLCBpLmFyZ3MsIGkuaW5pdHJkCmRpZmYgLS1naXQgYS90b29scy9w eWdydWIvc3JjL0xpbG9Db25mLnB5IGIvdG9vbHMvcHlncnViL3NyYy9MaWxvQ29uZi5weQppbmRl eCAyY2I2NDlmMTE1Li44YzA4MGU2OTdjIDEwMDY0NAotLS0gYS90b29scy9weWdydWIvc3JjL0xp bG9Db25mLnB5CisrKyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvTGlsb0NvbmYucHkKQEAgLTQsNyArNCw3 IEBACiAKIGltcG9ydCBzeXMsIHJlLCBvcwogaW1wb3J0IGxvZ2dpbmcKLWltcG9ydCBHcnViQ29u ZgorZnJvbSAuIGltcG9ydCBHcnViQ29uZgogCiBjbGFzcyBMaWxvSW1hZ2Uob2JqZWN0KToKICAg ICBkZWYgX19pbml0X18oc2VsZiwgbGluZXMsIHBhdGgpOgpAQCAtMjQsMTIgKzI0LDEyIEBAIGNs YXNzIExpbG9JbWFnZShvYmplY3QpOgogICAgICAgICBzZWxmLmxpbmVzID0gW10KICAgICAgICAg c2VsZi5wYXRoID0gcGF0aAogICAgICAgICBzZWxmLnJvb3QgPSAiIgotICAgICAgICBtYXAoc2Vs Zi5zZXRfZnJvbV9saW5lLCBsaW5lcykKKyAgICAgICAgbGlzdChtYXAoc2VsZi5zZXRfZnJvbV9s aW5lLCBsaW5lcykpCiAKICAgICBkZWYgc2V0X2Zyb21fbGluZShzZWxmLCBsaW5lLCByZXBsYWNl ID0gTm9uZSk6CiAgICAgICAgIChjb20sIGFyZykgPSBHcnViQ29uZi5ncnViX2V4YWN0X3NwbGl0 KGxpbmUsIDIpCiAKLSAgICAgICAgaWYgc2VsZi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAg ICAgIGlmIGNvbSBpbiBzZWxmLmNvbW1hbmRzOgogICAgICAgICAgICAgaWYgc2VsZi5jb21tYW5k c1tjb21dIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwgc2VsZi5j b21tYW5kc1tjb21dLCByZS5zdWIoJ14iKC4rKSIkJywgciJcMSIsIGFyZy5zdHJpcCgpKSkKICAg ICAgICAgICAgIGVsc2U6CkBAIC05Nyw3ICs5Nyw3IEBAIGNsYXNzIExpbG9Db25maWdGaWxlKG9i amVjdCk6CiAgICAgZGVmIHBhcnNlKHNlbGYsIGJ1ZiA9IE5vbmUpOgogICAgICAgICBpZiBidWYg aXMgTm9uZToKICAgICAgICAgICAgIGlmIHNlbGYuZmlsZW5hbWUgaXMgTm9uZToKLSAgICAgICAg ICAgICAgICByYWlzZSBWYWx1ZUVycm9yLCAiTm8gY29uZmlnIGZpbGUgZGVmaW5lZCB0byBwYXJz ZSEiCisgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiTm8gY29uZmlnIGZpbGUgZGVm aW5lZCB0byBwYXJzZSEiKQogCiAgICAgICAgICAgICBmID0gb3BlbihzZWxmLmZpbGVuYW1lLCAn cicpCiAgICAgICAgICAgICBsaW5lcyA9IGYucmVhZGxpbmVzKCkKQEAgLTEyNyw3ICsxMjcsNyBA QCBjbGFzcyBMaWxvQ29uZmlnRmlsZShvYmplY3QpOgogICAgICAgICAgICAgICAgIGNvbnRpbnVl CiAKICAgICAgICAgICAgIChjb20sIGFyZykgPSBHcnViQ29uZi5ncnViX2V4YWN0X3NwbGl0KGws IDIpCi0gICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzLmhhc19rZXkoY29tKToKKyAgICAgICAg ICAgIGlmIGNvbSBpbiBzZWxmLmNvbW1hbmRzOgogICAgICAgICAgICAgICAgIGlmIHNlbGYuY29t bWFuZHNbY29tXSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAgc2V0YXR0cihzZWxm LCBzZWxmLmNvbW1hbmRzW2NvbV0sIGFyZy5zdHJpcCgpKQogICAgICAgICAgICAgICAgIGVsc2U6 CkBAIC0xNzAsOCArMTcwLDggQEAgY2xhc3MgTGlsb0NvbmZpZ0ZpbGUob2JqZWN0KToKIAogaWYg X19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICBpZiBsZW4oc3lzLmFyZ3YpIDwgMjoKLSAgICAg ICAgcmFpc2UgUnVudGltZUVycm9yLCAiTmVlZCBhIGxpbG8uY29uZiB0byByZWFkIgorICAgICAg ICByYWlzZSBSdW50aW1lRXJyb3IoIk5lZWQgYSBsaWxvLmNvbmYgdG8gcmVhZCIpCiAgICAgZyA9 IExpbG9Db25maWdGaWxlKHN5cy5hcmd2WzFdKQogICAgIGZvciBpIGluIGcuaW1hZ2VzOgotICAg ICAgICBwcmludCBpICMsIGkudGl0bGUsIGkucm9vdCwgaS5rZXJuZWwsIGkuYXJncywgaS5pbml0 cmQKLSAgICBwcmludCBnLmRlZmF1bHQKKyAgICAgICAgcHJpbnQoaSkgIywgaS50aXRsZSwgaS5y b290LCBpLmtlcm5lbCwgaS5hcmdzLCBpLmluaXRyZAorICAgIHByaW50KGcuZGVmYXVsdCkKLS0g CjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0 dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=