From: Wei Liu Subject: [PATCH v3 6/7] pygrub: make python scripts work with 2.6 and up Date: Mon, 11 Mar 2019 13:04:33 +0000 Message-ID: <20190311130434.10437-7-wei.liu2@citrix.com> References: <20190311130434.10437-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 1h3Kbh-0004IF-04 for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 13:04:41 +0000 In-Reply-To: <20190311130434.10437-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: Anthony PERARD , Andrew Cooper , Ian Jackson , Wei Liu , George Dunlap List-Id: xen-devel@lists.xenproject.org UnVuIDJ0bzMgYW5kIHBpY2sgdGhlIHNlbnNpYmxlIHN1Z2dlc3Rpb25zLgoKSW1wb3J0IHByaW50 X2Z1bmN0aW9uIGFuZCBhYnNvbHV0ZV9pbXBvcnQgc28gMi42IGNhbiB3b3JrLgoKVGhlcmUgaGFz IG5ldmVyIGJlZW4gYSBjdXJzZXMud3JhcHBlciBtb2R1bGUgYWNjb3JkaW5nIHRvIDIueCBhbmQg My54CmRvYywgb25seSBhIGZ1bmN0aW9uLCBzbyAiaW1wb3J0IGN1cnNlcy53cmFwcGVyIiBpcyBu b3QgY29ycmVjdC4gSXQKaGFwcGVuZWQgdG8gd29yayBiZWNhdXNlIDIueCBpbXBsZW1lbnRlZCBh ICh1bmRvY3VtZW50ZWQpIG1vZHVsZS4KCldlIG9ubHkgbmVlZCB0byBpbXBvcnQgY3Vyc2VzIHRv IG1ha2UgY3Vyc2VzLndyYXBwZXIgYXZhaWxhYmxlIHRvCnB5Z3J1Yi4KClNpZ25lZC1vZmYtYnk6 IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvcHlncnViL3NyYy9FeHRM aW51eENvbmYucHkgfCAxOSArKysrKystLS0tLQogdG9vbHMvcHlncnViL3NyYy9HcnViQ29uZi5w eSAgICAgfCAzOSArKysrKysrKysrKystLS0tLS0tLS0tCiB0b29scy9weWdydWIvc3JjL0xpbG9D b25mLnB5ICAgICB8IDE5ICsrKysrKy0tLS0tCiB0b29scy9weWdydWIvc3JjL3B5Z3J1YiAgICAg ICAgICB8IDcxICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQgZmls ZXMgY2hhbmdlZCwgNzggaW5zZXJ0aW9ucygrKSwgNzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvdG9vbHMvcHlncnViL3NyYy9FeHRMaW51eENvbmYucHkgYi90b29scy9weWdydWIvc3JjL0V4 dExpbnV4Q29uZi5weQppbmRleCBkMTc4OWJmMDIwLi45ZmQ2MzViOWNmIDEwMDY0NAotLS0gYS90 b29scy9weWdydWIvc3JjL0V4dExpbnV4Q29uZi5weQorKysgYi90b29scy9weWdydWIvc3JjL0V4 dExpbnV4Q29uZi5weQpAQCAtMTAsOSArMTAsMTEgQEAKICMgYWxvbmcgd2l0aCB0aGlzIHByb2dy YW07IElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KICMKIAorZnJv bSBfX2Z1dHVyZV9fIGltcG9ydCBwcmludF9mdW5jdGlvbiwgYWJzb2x1dGVfaW1wb3J0CisKIGlt cG9ydCBzeXMsIHJlLCBvcwogaW1wb3J0IGxvZ2dpbmcKLWltcG9ydCBHcnViQ29uZgorZnJvbSAu IGltcG9ydCBHcnViQ29uZgogCiBjbGFzcyBFeHRMaW51eEltYWdlKG9iamVjdCk6CiAgICAgZGVm IF9faW5pdF9fKHNlbGYsIGxpbmVzLCBwYXRoKToKQEAgLTMyLDcgKzM0LDggQEAgY2xhc3MgRXh0 TGludXhJbWFnZShvYmplY3QpOgogICAgICAgICBzZWxmLmxpbmVzID0gW10KICAgICAgICAgc2Vs Zi5wYXRoID0gcGF0aAogICAgICAgICBzZWxmLnJvb3QgPSAiIgotICAgICAgICBtYXAoc2VsZi5z ZXRfZnJvbV9saW5lLCBsaW5lcykKKyAgICAgICAgZm9yIGxpbmUgaW4gbGluZXM6CisgICAgICAg ICAgICBzZWxmLnNldF9mcm9tX2xpbmUobGluZSkKIAogICAgIGRlZiBzZXRfZnJvbV9saW5lKHNl bGYsIGxpbmUsIHJlcGxhY2UgPSBOb25lKToKICAgICAgICAgKGNvbSwgYXJnKSA9IEdydWJDb25m LmdydWJfZXhhY3Rfc3BsaXQobGluZSwgMikKQEAgLTY3LDcgKzcwLDcgQEAgY2xhc3MgRXh0TGlu dXhJbWFnZShvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICAgICAgc2V0YXR0cihzZWxmLCAi aW5pdHJkIiwgYS5yZXBsYWNlKCJpbml0cmQ9IiwgIiIpKQogICAgICAgICAgICAgICAgICAgICAg ICAgYXJnID0gYXJnLnJlcGxhY2UoYSwgIiIpCiAKLSAgICAgICAgaWYgY29tIGlzIG5vdCBOb25l IGFuZCBzZWxmLmNvbW1hbmRzLmhhc19rZXkoY29tKToKKyAgICAgICAgaWYgY29tIGlzIG5vdCBO b25lIGFuZCBjb20gaW4gc2VsZi5jb21tYW5kczoKICAgICAgICAgICAgIGlmIHNlbGYuY29tbWFu ZHNbY29tXSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICBzZXRhdHRyKHNlbGYsIHNlbGYu Y29tbWFuZHNbY29tXSwgcmUuc3ViKCdeIiguKykiJCcsIHIiXDEiLCBhcmcuc3RyaXAoKSkpCiAg ICAgICAgICAgICBlbHNlOgpAQCAtMTM2LDcgKzEzOSw3IEBAIGNsYXNzIEV4dExpbnV4Q29uZmln RmlsZShvYmplY3QpOgogICAgIGRlZiBwYXJzZShzZWxmLCBidWYgPSBOb25lKToKICAgICAgICAg aWYgYnVmIGlzIE5vbmU6CiAgICAgICAgICAgICBpZiBzZWxmLmZpbGVuYW1lIGlzIE5vbmU6Ci0g ICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvciwgIk5vIGNvbmZpZyBmaWxlIGRlZmluZWQg dG8gcGFyc2UhIgorICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIk5vIGNvbmZpZyBm aWxlIGRlZmluZWQgdG8gcGFyc2UhIikKIAogICAgICAgICAgICAgZiA9IG9wZW4oc2VsZi5maWxl bmFtZSwgJ3InKQogICAgICAgICAgICAgbGluZXMgPSBmLnJlYWRsaW5lcygpCkBAIC0xNjcsNyAr MTcwLDcgQEAgY2xhc3MgRXh0TGludXhDb25maWdGaWxlKG9iamVjdCk6CiAKICAgICAgICAgICAg IChjb20sIGFyZykgPSBHcnViQ29uZi5ncnViX2V4YWN0X3NwbGl0KGwsIDIpCiAgICAgICAgICAg ICBjb20gPSBjb20ubG93ZXIoKQotICAgICAgICAgICAgaWYgc2VsZi5jb21tYW5kcy5oYXNfa2V5 KGNvbSk6CisgICAgICAgICAgICBpZiBjb20gaW4gc2VsZi5jb21tYW5kczoKICAgICAgICAgICAg ICAgICBpZiBzZWxmLmNvbW1hbmRzW2NvbV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAg ICAgIHNldGF0dHIoc2VsZiwgc2VsZi5jb21tYW5kc1tjb21dLCBhcmcuc3RyaXAoKSkKICAgICAg ICAgICAgICAgICBlbHNlOgpAQCAtMjA3LDggKzIxMCw4IEBAIGNsYXNzIEV4dExpbnV4Q29uZmln RmlsZShvYmplY3QpOgogICAgICAgICAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAg aWYgbGVuKHN5cy5hcmd2KSA8IDI6Ci0gICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvciwgIk5lZWQg YSBjb25maWd1cmF0aW9uIGZpbGUgdG8gcmVhZCIKKyAgICAgICAgcmFpc2UgUnVudGltZUVycm9y KCJOZWVkIGEgY29uZmlndXJhdGlvbiBmaWxlIHRvIHJlYWQiKQogICAgIGcgPSBFeHRMaW51eENv bmZpZ0ZpbGUoc3lzLmFyZ3ZbMV0pCiAgICAgZm9yIGkgaW4gZy5pbWFnZXM6Ci0gICAgICAgIHBy aW50IGkKLSAgICBwcmludCBnLmRlZmF1bHQKKyAgICAgICAgcHJpbnQoaSkKKyAgICBwcmludChn LmRlZmF1bHQpCmRpZmYgLS1naXQgYS90b29scy9weWdydWIvc3JjL0dydWJDb25mLnB5IGIvdG9v bHMvcHlncnViL3NyYy9HcnViQ29uZi5weQppbmRleCBkYzgxMGQ1NWNiLi5mOGQzNzk5ZGMwIDEw MDY0NAotLS0gYS90b29scy9weWdydWIvc3JjL0dydWJDb25mLnB5CisrKyBiL3Rvb2xzL3B5Z3J1 Yi9zcmMvR3J1YkNvbmYucHkKQEAgLTEyLDYgKzEyLDggQEAKICMgYWxvbmcgd2l0aCB0aGlzIHBy b2dyYW07IElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KICMKIAor ZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCBwcmludF9mdW5jdGlvbiwgYWJzb2x1dGVfaW1wb3J0CisK IGltcG9ydCBvcywgc3lzCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IHJlCkBAIC00NCw3ICs0Niw3 IEBAIGRlZiBnZXRfcGF0aChzKToKICAgICAgICAgcmV0dXJuIChOb25lLCBzKQogICAgIGlkeCA9 IHMuZmluZCgnKScpCiAgICAgaWYgaWR4ID09IC0xOgotICAgICAgICByYWlzZSBWYWx1ZUVycm9y LCAiVW5hYmxlIHRvIGZpbmQgbWF0Y2hpbmcgJyknIgorICAgICAgICByYWlzZSBWYWx1ZUVycm9y KCJVbmFibGUgdG8gZmluZCBtYXRjaGluZyAnKSciKQogICAgIGQgPSBzWzppZHhdCiAgICAgcmV0 dXJuIChHcnViRGlza1BhcnQoZCksIHNbaWR4ICsgMTpdKQogCkBAIC0xMDAsNyArMTAyLDggQEAg Y2xhc3MgX0dydWJJbWFnZShvYmplY3QpOgogICAgICAgICAgICAgICAgICIgIGluaXRyZDogJXNc biIgJShzZWxmLnRpdGxlLCBzZWxmLnJvb3QsIHNlbGYua2VybmVsLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLmFyZ3MsIHNlbGYuaW5pdHJkKSkKICAgICBkZWYgX3Bh cnNlKHNlbGYsIGxpbmVzKToKLSAgICAgICAgbWFwKHNlbGYuc2V0X2Zyb21fbGluZSwgbGluZXMp CisgICAgICAgIGZvciBsaW5lIGluIGxpbmVzOgorICAgICAgICAgICAgc2VsZi5zZXRfZnJvbV9s aW5lKGxpbmUpCiAKICAgICBkZWYgcmVzZXQoc2VsZiwgbGluZXMpOgogICAgICAgICBzZWxmLl9y b290ID0gc2VsZi5faW5pdHJkID0gc2VsZi5fa2VybmVsID0gc2VsZi5fYXJncyA9IE5vbmUKQEAg LTE0MSw3ICsxNDQsNyBAQCBjbGFzcyBHcnViSW1hZ2UoX0dydWJJbWFnZSk6CiAgICAgZGVmIHNl dF9mcm9tX2xpbmUoc2VsZiwgbGluZSwgcmVwbGFjZSA9IE5vbmUpOgogICAgICAgICAoY29tLCBh cmcpID0gZ3J1Yl9leGFjdF9zcGxpdChsaW5lLCAyKQogCi0gICAgICAgIGlmIHNlbGYuY29tbWFu ZHMuaGFzX2tleShjb20pOgorICAgICAgICBpZiBjb20gaW4gc2VsZi5jb21tYW5kczoKICAgICAg ICAgICAgIGlmIHNlbGYuY29tbWFuZHNbY29tXSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAg ICBzZXRhdHRyKHNlbGYsIHNlbGYuY29tbWFuZHNbY29tXSwgYXJnLnN0cmlwKCkpCiAgICAgICAg ICAgICBlbHNlOgpAQCAtMTc3LDcgKzE4MCw3IEBAIGNsYXNzIF9HcnViQ29uZmlnRmlsZShvYmpl Y3QpOgogICAgICAgICAgICAgc2VsZi5wYXJzZSgpCiAKICAgICBkZWYgcGFyc2Uoc2VsZiwgYnVm ID0gTm9uZSk6Ci0gICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvciwgInVuaW1wbGVtZW50ZWQgcGFy c2UgZnVuY3Rpb24iICAgCisgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigidW5pbXBsZW1lbnRl ZCBwYXJzZSBmdW5jdGlvbiIpCiAKICAgICBkZWYgaGFzUGFzc3dvcmRBY2Nlc3Moc2VsZik6CiAg ICAgICAgIHJldHVybiBzZWxmLnBhc3N3b3JkQWNjZXNzCkBAIC0yMDEsNyArMjA0LDcgQEAgY2xh c3MgX0dydWJDb25maWdGaWxlKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgaW1wb3J0IGNyeXB0 CiAgICAgICAgICAgICAgICAgaWYgY3J5cHQuY3J5cHQocGFzc3dvcmQsIHB3ZFsxXSkgPT0gcHdk WzFdOgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQotICAgICAgICAgICAgZXhjZXB0 IEV4Y2VwdGlvbiwgZToKKyAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAg ICAgICAgICAgICBzZWxmLnBhc3NFeGMgPSAiQ2FuJ3QgdmVyaWZ5IHBhc3N3b3JkOiAlcyIgJSBz dHIoZSkKICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIApAQCAtMjEzLDcgKzIxNiw3IEBA IGNsYXNzIF9HcnViQ29uZmlnRmlsZShvYmplY3QpOgogCiAgICAgZGVmIHNldChzZWxmLCBsaW5l KToKICAgICAgICAgKGNvbSwgYXJnKSA9IGdydWJfZXhhY3Rfc3BsaXQobGluZSwgMikKLSAgICAg ICAgaWYgc2VsZi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAgICAgIGlmIGNvbSBpbiBzZWxm LmNvbW1hbmRzOgogICAgICAgICAgICAgaWYgc2VsZi5jb21tYW5kc1tjb21dIGlzIG5vdCBOb25l OgogICAgICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwgc2VsZi5jb21tYW5kc1tjb21dLCBhcmcu c3RyaXAoKSkKICAgICAgICAgICAgIGVsc2U6CkBAIC0yMzMsNyArMjM2LDcgQEAgY2xhc3MgX0dy dWJDb25maWdGaWxlKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9kZWZhdWx0ID0gdmFsCiAK ICAgICAgICAgaWYgc2VsZi5fZGVmYXVsdCA8IDA6Ci0gICAgICAgICAgICByYWlzZSBWYWx1ZUVy cm9yLCAiZGVmYXVsdCBtdXN0IGJlIHBvc2l0aXZlIG51bWJlciIKKyAgICAgICAgICAgIHJhaXNl IFZhbHVlRXJyb3IoImRlZmF1bHQgbXVzdCBiZSBwb3NpdGl2ZSBudW1iZXIiKQogICAgIGRlZmF1 bHQgPSBwcm9wZXJ0eShfZ2V0X2RlZmF1bHQsIF9zZXRfZGVmYXVsdCkKIAogICAgIGRlZiBzZXRf c3BsYXNoKHNlbGYsIHZhbCk6CkBAIC0yNjUsNyArMjY4LDcgQEAgY2xhc3MgR3J1YkNvbmZpZ0Zp bGUoX0dydWJDb25maWdGaWxlKToKICAgICBkZWYgcGFyc2Uoc2VsZiwgYnVmID0gTm9uZSk6CiAg ICAgICAgIGlmIGJ1ZiBpcyBOb25lOgogICAgICAgICAgICAgaWYgc2VsZi5maWxlbmFtZSBpcyBO b25lOgotICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IsICJObyBjb25maWcgZmlsZSBk ZWZpbmVkIHRvIHBhcnNlISIKKyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJObyBj b25maWcgZmlsZSBkZWZpbmVkIHRvIHBhcnNlISIpCiAKICAgICAgICAgICAgIGYgPSBvcGVuKHNl bGYuZmlsZW5hbWUsICdyJykKICAgICAgICAgICAgIGxpbmVzID0gZi5yZWFkbGluZXMoKQpAQCAt Mjk2LDcgKzI5OSw3IEBAIGNsYXNzIEdydWJDb25maWdGaWxlKF9HcnViQ29uZmlnRmlsZSk6CiAg ICAgICAgICAgICAgICAgY29udGludWUKIAogICAgICAgICAgICAgKGNvbSwgYXJnKSA9IGdydWJf ZXhhY3Rfc3BsaXQobCwgMikKLSAgICAgICAgICAgIGlmIHNlbGYuY29tbWFuZHMuaGFzX2tleShj b20pOgorICAgICAgICAgICAgaWYgY29tIGluIHNlbGYuY29tbWFuZHM6CiAgICAgICAgICAgICAg ICAgaWYgc2VsZi5jb21tYW5kc1tjb21dIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgICAgICAg ICBzZXRhdHRyKHNlbGYsIHNlbGYuY29tbWFuZHNbY29tXSwgYXJnLnN0cmlwKCkpCiAgICAgICAg ICAgICAgICAgZWxzZToKQEAgLTMyOCw3ICszMzEsNyBAQCBjbGFzcyBHcnViMkltYWdlKF9HcnVi SW1hZ2UpOgogICAgICAgICBpZiBjb20gPT0gInNldCI6CiAgICAgICAgICAgICAoY29tLGFyZykg PSBncnViMl9oYW5kbGVfc2V0KGFyZykKICAgICAgICAgICAgIAotICAgICAgICBpZiBzZWxmLmNv bW1hbmRzLmhhc19rZXkoY29tKToKKyAgICAgICAgaWYgY29tIGluIHNlbGYuY29tbWFuZHM6CiAg ICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzW2NvbV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAg ICAgICAgc2V0YXR0cihzZWxmLCBzZWxmLmNvbW1hbmRzW2NvbV0sIGFyZy5zdHJpcCgpKQogICAg ICAgICAgICAgZWxzZToKQEAgLTM2NCw3ICszNjcsNyBAQCBjbGFzcyBHcnViMkNvbmZpZ0ZpbGUo X0dydWJDb25maWdGaWxlKToKICAgICBkZWYgcGFyc2Uoc2VsZiwgYnVmID0gTm9uZSk6CiAgICAg ICAgIGlmIGJ1ZiBpcyBOb25lOgogICAgICAgICAgICAgaWYgc2VsZi5maWxlbmFtZSBpcyBOb25l OgotICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IsICJObyBjb25maWcgZmlsZSBkZWZp bmVkIHRvIHBhcnNlISIKKyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJObyBjb25m aWcgZmlsZSBkZWZpbmVkIHRvIHBhcnNlISIpCiAKICAgICAgICAgICAgIGYgPSBvcGVuKHNlbGYu ZmlsZW5hbWUsICdyJykKICAgICAgICAgICAgIGxpbmVzID0gZi5yZWFkbGluZXMoKQpAQCAtMzk4 LDcgKzQwMSw3IEBAIGNsYXNzIEdydWIyQ29uZmlnRmlsZShfR3J1YkNvbmZpZ0ZpbGUpOgogICAg ICAgICAgICAgdGl0bGVfbWF0Y2ggPSByZS5tYXRjaCgnXm1lbnVlbnRyeSBbIlwnXSguKj8pWyJc J10gKC4qKXsnLCBsKQogICAgICAgICAgICAgaWYgdGl0bGVfbWF0Y2g6CiAgICAgICAgICAgICAg ICAgaWYgaW1nIGlzIG5vdCBOb25lOgotICAgICAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1l RXJyb3IsICJzeW50YXggZXJyb3I6IGNhbm5vdCBuZXN0IG1lbnVlbnRyeSAoJWQgJXMpIiAlIChs ZW4oaW1nKSxpbWcpCisgICAgICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigic3lu dGF4IGVycm9yOiBjYW5ub3QgbmVzdCBtZW51ZW50cnkgKCVkICVzKSIgJSAobGVuKGltZyksaW1n KSkKICAgICAgICAgICAgICAgICBpbWcgPSBbXQogICAgICAgICAgICAgICAgIHRpdGxlID0gdGl0 bGVfbWF0Y2guZ3JvdXAoMSkKICAgICAgICAgICAgICAgICBjb250aW51ZQpAQCAtNDEzLDcgKzQx Niw3IEBAIGNsYXNzIEdydWIyQ29uZmlnRmlsZShfR3J1YkNvbmZpZ0ZpbGUpOgogICAgICAgICAg ICAgICAgICAgICAgICAgbWVudV9sZXZlbCAtPSAxCiAgICAgICAgICAgICAgICAgICAgICAgICBj b250aW51ZQogICAgICAgICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICAg ICAgcmFpc2UgUnVudGltZUVycm9yLCAic3ludGF4IGVycm9yOiBjbG9zaW5nIGJyYWNlIHdpdGhv dXQgbWVudWVudHJ5IgorICAgICAgICAgICAgICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9y KCJzeW50YXggZXJyb3I6IGNsb3NpbmcgYnJhY2Ugd2l0aG91dCBtZW51ZW50cnkiKQogCiAgICAg ICAgICAgICAgICAgc2VsZi5hZGRfaW1hZ2UoR3J1YjJJbWFnZSh0aXRsZSwgaW1nKSkKICAgICAg ICAgICAgICAgICBpbWcgPSBOb25lCkBAIC00MjgsNyArNDMxLDcgQEAgY2xhc3MgR3J1YjJDb25m aWdGaWxlKF9HcnViQ29uZmlnRmlsZSk6CiAgICAgICAgICAgICBpZiBjb20gPT0gInNldCI6CiAg ICAgICAgICAgICAgICAgKGNvbSxhcmcpID0gZ3J1YjJfaGFuZGxlX3NldChhcmcpCiAgICAgICAg ICAgICAgICAgCi0gICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzLmhhc19rZXkoY29tKToKKyAg ICAgICAgICAgIGlmIGNvbSBpbiBzZWxmLmNvbW1hbmRzOgogICAgICAgICAgICAgICAgIGlmIHNl bGYuY29tbWFuZHNbY29tXSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAgYXJnX3N0 cmlwID0gYXJnLnN0cmlwKCkKICAgICAgICAgICAgICAgICAgICAgaWYgYXJnX3N0cmlwID09ICIk e3NhdmVkX2VudHJ5fSIgb3IgYXJnX3N0cmlwID09ICIke25leHRfZW50cnl9IjoKQEAgLTQ0Myw3 ICs0NDYsNyBAQCBjbGFzcyBHcnViMkNvbmZpZ0ZpbGUoX0dydWJDb25maWdGaWxlKToKICAgICAg ICAgICAgICAgICBsb2dnaW5nLndhcm5pbmcoIlVua25vd24gZGlyZWN0aXZlICVzIiAlKGNvbSwp KQogICAgICAgICAgICAgCiAgICAgICAgIGlmIGltZyBpcyBub3QgTm9uZToKLSAgICAgICAgICAg IHJhaXNlIFJ1bnRpbWVFcnJvciwgInN5bnRheCBlcnJvcjogZW5kIG9mIGZpbGUgd2l0aCBvcGVu IG1lbnVlbnRyeSglZCAlcykiICUgKGxlbihpbWcpLGltZykKKyAgICAgICAgICAgIHJhaXNlIFJ1 bnRpbWVFcnJvcigic3ludGF4IGVycm9yOiBlbmQgb2YgZmlsZSB3aXRoIG9wZW4gbWVudWVudHJ5 KCVkICVzKSIgJSAobGVuKGltZyksaW1nKSkKIAogICAgICAgICBpZiBzZWxmLmhhc1Bhc3N3b3Jk KCk6CiAgICAgICAgICAgICBzZWxmLnNldFBhc3N3b3JkQWNjZXNzKEZhbHNlKQpAQCAtNDYyLDEy ICs0NjUsMTIgQEAgY2xhc3MgR3J1YjJDb25maWdGaWxlKF9HcnViQ29uZmlnRmlsZSk6CiAgICAg ICAgIAogaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICBpZiBsZW4oc3lzLmFyZ3YpIDwg MzoKLSAgICAgICAgcmFpc2UgUnVudGltZUVycm9yLCAiTmVlZCBhIGdydWIgdmVyc2lvbiAoXCJn cnViXCIgb3IgXCJncnViMlwiKSBhbmQgYSBncnViLmNvbmYgb3IgZ3J1Yi5jZmcgdG8gcmVhZCIK KyAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdOZWVkIGEgZ3J1YiB2ZXJzaW9uICgiZ3J1YiIg b3IgImdydWIyIikgYW5kIGEgZ3J1Yi5jb25mIG9yIGdydWIuY2ZnIHRvIHJlYWQnKQogICAgIGlm IHN5cy5hcmd2WzFdID09ICJncnViIjoKICAgICAgICAgZyA9IEdydWJDb25maWdGaWxlKHN5cy5h cmd2WzJdKQogICAgIGVsaWYgc3lzLmFyZ3ZbMV0gPT0gImdydWIyIjoKICAgICAgICAgZyA9IEdy dWIyQ29uZmlnRmlsZShzeXMuYXJndlsyXSkKICAgICBlbHNlOgotICAgICAgICByYWlzZSBSdW50 aW1lRXJyb3IsICJVbmtub3duIGNvbmZpZyB0eXBlICVzIiAlIHN5cy5hcmd2WzFdCisgICAgICAg IHJhaXNlIFJ1bnRpbWVFcnJvcigiVW5rbm93biBjb25maWcgdHlwZSAlcyIgJSBzeXMuYXJndlsx XSkKICAgICBmb3IgaSBpbiBnLmltYWdlczoKLSAgICAgICAgcHJpbnQgaSAjLCBpLnRpdGxlLCBp LnJvb3QsIGkua2VybmVsLCBpLmFyZ3MsIGkuaW5pdHJkCisgICAgICAgIHByaW50KGkpICMsIGku dGl0bGUsIGkucm9vdCwgaS5rZXJuZWwsIGkuYXJncywgaS5pbml0cmQKZGlmZiAtLWdpdCBhL3Rv b2xzL3B5Z3J1Yi9zcmMvTGlsb0NvbmYucHkgYi90b29scy9weWdydWIvc3JjL0xpbG9Db25mLnB5 CmluZGV4IDJjYjY0OWYxMTUuLmUzYmZjYjUyNDQgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3B5Z3J1Yi9z cmMvTGlsb0NvbmYucHkKKysrIGIvdG9vbHMvcHlncnViL3NyYy9MaWxvQ29uZi5weQpAQCAtMiw5 ICsyLDExIEBACiAjTGlsb0NvbmYucHkKICMKIAorZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCBwcmlu dF9mdW5jdGlvbiwgYWJzb2x1dGVfaW1wb3J0CisKIGltcG9ydCBzeXMsIHJlLCBvcwogaW1wb3J0 IGxvZ2dpbmcKLWltcG9ydCBHcnViQ29uZgorZnJvbSAuIGltcG9ydCBHcnViQ29uZgogCiBjbGFz cyBMaWxvSW1hZ2Uob2JqZWN0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgbGluZXMsIHBhdGgp OgpAQCAtMjQsMTIgKzI2LDEzIEBAIGNsYXNzIExpbG9JbWFnZShvYmplY3QpOgogICAgICAgICBz ZWxmLmxpbmVzID0gW10KICAgICAgICAgc2VsZi5wYXRoID0gcGF0aAogICAgICAgICBzZWxmLnJv b3QgPSAiIgotICAgICAgICBtYXAoc2VsZi5zZXRfZnJvbV9saW5lLCBsaW5lcykKKyAgICAgICAg Zm9yIGxpbmUgaW4gbGluZXM6CisgICAgICAgICAgICBzZWxmLnNldF9mcm9tX2xpbmUobGluZSkK IAogICAgIGRlZiBzZXRfZnJvbV9saW5lKHNlbGYsIGxpbmUsIHJlcGxhY2UgPSBOb25lKToKICAg ICAgICAgKGNvbSwgYXJnKSA9IEdydWJDb25mLmdydWJfZXhhY3Rfc3BsaXQobGluZSwgMikKIAot ICAgICAgICBpZiBzZWxmLmNvbW1hbmRzLmhhc19rZXkoY29tKToKKyAgICAgICAgaWYgY29tIGlu IHNlbGYuY29tbWFuZHM6CiAgICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzW2NvbV0gaXMgbm90 IE5vbmU6CiAgICAgICAgICAgICAgICAgc2V0YXR0cihzZWxmLCBzZWxmLmNvbW1hbmRzW2NvbV0s IHJlLnN1YignXiIoLispIiQnLCByIlwxIiwgYXJnLnN0cmlwKCkpKQogICAgICAgICAgICAgZWxz ZToKQEAgLTk3LDcgKzEwMCw3IEBAIGNsYXNzIExpbG9Db25maWdGaWxlKG9iamVjdCk6CiAgICAg ZGVmIHBhcnNlKHNlbGYsIGJ1ZiA9IE5vbmUpOgogICAgICAgICBpZiBidWYgaXMgTm9uZToKICAg ICAgICAgICAgIGlmIHNlbGYuZmlsZW5hbWUgaXMgTm9uZToKLSAgICAgICAgICAgICAgICByYWlz ZSBWYWx1ZUVycm9yLCAiTm8gY29uZmlnIGZpbGUgZGVmaW5lZCB0byBwYXJzZSEiCisgICAgICAg ICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiTm8gY29uZmlnIGZpbGUgZGVmaW5lZCB0byBwYXJz ZSEiKQogCiAgICAgICAgICAgICBmID0gb3BlbihzZWxmLmZpbGVuYW1lLCAncicpCiAgICAgICAg ICAgICBsaW5lcyA9IGYucmVhZGxpbmVzKCkKQEAgLTEyNyw3ICsxMzAsNyBAQCBjbGFzcyBMaWxv Q29uZmlnRmlsZShvYmplY3QpOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKICAgICAgICAg ICAgIChjb20sIGFyZykgPSBHcnViQ29uZi5ncnViX2V4YWN0X3NwbGl0KGwsIDIpCi0gICAgICAg ICAgICBpZiBzZWxmLmNvbW1hbmRzLmhhc19rZXkoY29tKToKKyAgICAgICAgICAgIGlmIGNvbSBp biBzZWxmLmNvbW1hbmRzOgogICAgICAgICAgICAgICAgIGlmIHNlbGYuY29tbWFuZHNbY29tXSBp cyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAgc2V0YXR0cihzZWxmLCBzZWxmLmNvbW1h bmRzW2NvbV0sIGFyZy5zdHJpcCgpKQogICAgICAgICAgICAgICAgIGVsc2U6CkBAIC0xNzAsOCAr MTczLDggQEAgY2xhc3MgTGlsb0NvbmZpZ0ZpbGUob2JqZWN0KToKIAogaWYgX19uYW1lX18gPT0g Il9fbWFpbl9fIjoKICAgICBpZiBsZW4oc3lzLmFyZ3YpIDwgMjoKLSAgICAgICAgcmFpc2UgUnVu dGltZUVycm9yLCAiTmVlZCBhIGxpbG8uY29uZiB0byByZWFkIgorICAgICAgICByYWlzZSBSdW50 aW1lRXJyb3IoIk5lZWQgYSBsaWxvLmNvbmYgdG8gcmVhZCIpCiAgICAgZyA9IExpbG9Db25maWdG aWxlKHN5cy5hcmd2WzFdKQogICAgIGZvciBpIGluIGcuaW1hZ2VzOgotICAgICAgICBwcmludCBp ICMsIGkudGl0bGUsIGkucm9vdCwgaS5rZXJuZWwsIGkuYXJncywgaS5pbml0cmQKLSAgICBwcmlu dCBnLmRlZmF1bHQKKyAgICAgICAgcHJpbnQoaSkgIywgaS50aXRsZSwgaS5yb290LCBpLmtlcm5l bCwgaS5hcmdzLCBpLmluaXRyZAorICAgIHByaW50KGcuZGVmYXVsdCkKZGlmZiAtLWdpdCBhL3Rv b2xzL3B5Z3J1Yi9zcmMvcHlncnViIGIvdG9vbHMvcHlncnViL3NyYy9weWdydWIKaW5kZXggMTE4 OWIxY2E0OC4uZGJkY2UzMTVjNiAxMDA3NTUKLS0tIGEvdG9vbHMvcHlncnViL3NyYy9weWdydWIK KysrIGIvdG9vbHMvcHlncnViL3NyYy9weWdydWIKQEAgLTEyLDEzICsxMiwxNSBAQAogIyBhbG9u ZyB3aXRoIHRoaXMgcHJvZ3JhbTsgSWYgbm90LCBzZWUgPGh0dHA6Ly93d3cuZ251Lm9yZy9saWNl bnNlcy8+LgogIwogCitmcm9tIF9fZnV0dXJlX18gaW1wb3J0IHByaW50X2Z1bmN0aW9uCisKIGlt cG9ydCBvcywgc3lzLCBzdHJpbmcsIHN0cnVjdCwgdGVtcGZpbGUsIHJlLCB0cmFjZWJhY2ssIHN0 YXQsIGVycm5vCiBpbXBvcnQgY29weQogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBwbGF0Zm9ybQog aW1wb3J0IHhlbi5sb3dsZXZlbC54YwogCi1pbXBvcnQgY3Vyc2VzLCBfY3Vyc2VzLCBjdXJzZXMu d3JhcHBlciwgY3Vyc2VzLnRleHRwYWQsIGN1cnNlcy5hc2NpaQoraW1wb3J0IGN1cnNlcywgX2N1 cnNlcywgY3Vyc2VzLnRleHRwYWQsIGN1cnNlcy5hc2NpaQogaW1wb3J0IGdldG9wdAogCiBpbXBv cnQgeGVuZnNpbWFnZQpAQCAtNzcsNyArNzksNyBAQCBkZWYgZ2V0X3NvbGFyaXNfc2xpY2UoZmls ZSwgb2Zmc2V0KToKICAgICBidWYgPSBvcy5yZWFkKGZkLCA1MTIpCiAgICAgb3MuY2xvc2UoZmQp CiAgICAgaWYgc3RydWN0LnVucGFjaygiPEgiLCBidWZbNTA4OjUxMF0pWzBdICE9IERLTF9NQUdJ QzoKLSAgICAgICAgcmFpc2UgUnVudGltZUVycm9yLCAiSW52YWxpZCBkaXNrbGFiZWwgbWFnaWMi CisgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiSW52YWxpZCBkaXNrbGFiZWwgbWFnaWMiKQog CiAgICAgbnNsaWNlcyA9IHN0cnVjdC51bnBhY2soIjxIIiwgYnVmWzMwOjMyXSlbMF0KIApAQCAt ODgsNyArOTAsNyBAQCBkZWYgZ2V0X3NvbGFyaXNfc2xpY2UoZmlsZSwgb2Zmc2V0KToKICAgICAg ICAgaWYgc2xpY2V0YWcgPT0gVl9ST09UOgogICAgICAgICAgICAgcmV0dXJuIHNsaWNlc2VjdCAq IFNFQ1RPUl9TSVpFCiAKLSAgICByYWlzZSBSdW50aW1lRXJyb3IsICJObyByb290IHNsaWNlIGZv dW5kIiAgICAgIAorICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiTm8gcm9vdCBzbGljZSBmb3VuZCIp CiAKIGRlZiBnZXRfZnNfb2Zmc2V0X2dwdChmaWxlKToKICAgICBmZCA9IG9zLm9wZW4oZmlsZSwg b3MuT19SRE9OTFkpCkBAIC00MjMsMjAgKzQyNSwxNyBAQCBjbGFzcyBHcnViOgogICAgICAgICB3 ZSdyZSBiZWluZyBnaXZlbiBhIHJhdyBjb25maWcgZmlsZSByYXRoZXIgdGhhbiBhIGRpc2sgaW1h Z2UuIiIiCiAgICAgICAgIAogICAgICAgICBpZiBub3Qgb3MuYWNjZXNzKGZuLCBvcy5SX09LKToK LSAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvciwgIlVuYWJsZSB0byBhY2Nlc3MgJXMiICUo Zm4sKQorICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCJVbmFibGUgdG8gYWNjZXNzICVz IiAlKGZuLCkpCiAKLSAgICAgICAgY2ZnX2xpc3QgPSBtYXAobGFtYmRhIHg6ICh4LGdydWIuR3J1 YkNvbmYuR3J1YjJDb25maWdGaWxlKSwKLSAgICAgICAgICAgICAgICAgICAgICAgWyIvYm9vdC9n cnViL2dydWIuY2ZnIiwgIi9ncnViL2dydWIuY2ZnIiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICIvYm9vdC9ncnViMi9ncnViLmNmZyIsICIvZ3J1YjIvZ3J1Yi5jZmciXSkgKyBcCi0gICAgICAg ICAgICAgICAgICAgbWFwKGxhbWJkYSB4OiAoeCxncnViLkV4dExpbnV4Q29uZi5FeHRMaW51eENv bmZpZ0ZpbGUpLAotICAgICAgICAgICAgICAgICAgICAgICBbIi9ib290L2lzb2xpbnV4L2lzb2xp bnV4LmNmZyIsCisgICAgICAgIGNmZ19saXN0ID0gWyh4LGdydWIuR3J1YkNvbmYuR3J1YjJDb25m aWdGaWxlKSBmb3IgeCBpbiBbIi9ib290L2dydWIvZ3J1Yi5jZmciLCAiL2dydWIvZ3J1Yi5jZmci LAorICAgICAgICAgICAgICAgICAgICAgICAgIi9ib290L2dydWIyL2dydWIuY2ZnIiwgIi9ncnVi Mi9ncnViLmNmZyJdXSArIFwKKyAgICAgICAgICAgICAgICAgICBbKHgsZ3J1Yi5FeHRMaW51eENv bmYuRXh0TGludXhDb25maWdGaWxlKSBmb3IgeCBpbiBbIi9ib290L2lzb2xpbnV4L2lzb2xpbnV4 LmNmZyIsCiAgICAgICAgICAgICAgICAgICAgICAgICAiL2Jvb3QvZXh0bGludXgvZXh0bGludXgu Y29uZiIsCiAgICAgICAgICAgICAgICAgICAgICAgICAiL2Jvb3QvZXh0bGludXguY29uZiIsCiAg ICAgICAgICAgICAgICAgICAgICAgICAiL2V4dGxpbnV4L2V4dGxpbnV4LmNvbmYiLAotICAgICAg ICAgICAgICAgICAgICAgICAgIi9leHRsaW51eC5jb25mIl0pICsgXAotICAgICAgICAgICAgICAg ICAgIG1hcChsYW1iZGEgeDogKHgsZ3J1Yi5HcnViQ29uZi5HcnViQ29uZmlnRmlsZSksCi0gICAg ICAgICAgICAgICAgICAgICAgIFsiL2Jvb3QvZ3J1Yi9tZW51LmxzdCIsICIvYm9vdC9ncnViL2dy dWIuY29uZiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAiL2dydWIvbWVudS5sc3QiLCAiL2dy dWIvZ3J1Yi5jb25mIl0pCisgICAgICAgICAgICAgICAgICAgICAgICAiL2V4dGxpbnV4LmNvbmYi XV0gKyBcCisgICAgICAgICAgICAgICAgICAgWyh4LGdydWIuR3J1YkNvbmYuR3J1YkNvbmZpZ0Zp bGUpIGZvciB4IGluIFsiL2Jvb3QvZ3J1Yi9tZW51LmxzdCIsICIvYm9vdC9ncnViL2dydWIuY29u ZiIsCisgICAgICAgICAgICAgICAgICAgICAgICAiL2dydWIvbWVudS5sc3QiLCAiL2dydWIvZ3J1 Yi5jb25mIl1dCiAKICAgICAgICAgaWYgbm90IGZzOgogICAgICAgICAgICAgIyBzZXQgdGhlIGNv bmZpZyBmaWxlIGFuZCBwYXJzZSBpdApAQCAtNDQ4LDEyICs0NDcsMTIgQEAgY2xhc3MgR3J1YjoK IAogICAgICAgICBmb3IgZixwYXJzZXIgaW4gY2ZnX2xpc3Q6CiAgICAgICAgICAgICBpZiBmcy5m aWxlX2V4aXN0cyhmKToKLSAgICAgICAgICAgICAgICBwcmludCA+PnN5cy5zdGRlcnIsICJVc2lu ZyAlcyB0byBwYXJzZSAlcyIgJSAocGFyc2VyLGYpCisgICAgICAgICAgICAgICAgcHJpbnQoIlVz aW5nICVzIHRvIHBhcnNlICVzIiAlIChwYXJzZXIsZiksIGZpbGU9c3lzLnN0ZGVycikKICAgICAg ICAgICAgICAgICBzZWxmLmNmID0gcGFyc2VyKCkKICAgICAgICAgICAgICAgICBzZWxmLmNmLmZp bGVuYW1lID0gZgogICAgICAgICAgICAgICAgIGJyZWFrCiAgICAgICAgIGlmIHNlbGYuX19kaWN0 X18uZ2V0KCdjZicsIE5vbmUpIGlzIE5vbmU6Ci0gICAgICAgICAgICByYWlzZSBSdW50aW1lRXJy b3IsICJjb3VsZG4ndCBmaW5kIGJvb3Rsb2FkZXIgY29uZmlnIGZpbGUgaW4gdGhlIGltYWdlIHBy b3ZpZGVkLiIKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiY291bGRuJ3QgZmluZCBi b290bG9hZGVyIGNvbmZpZyBmaWxlIGluIHRoZSBpbWFnZSBwcm92aWRlZC4iKQogICAgICAgICBm ID0gZnMub3Blbl9maWxlKHNlbGYuY2YuZmlsZW5hbWUpCiAgICAgICAgICMgbGltaXQgcmVhZCBz aXplIHRvIGF2b2lkIHBhdGhvbG9naWNhbCBjYXNlcwogICAgICAgICBidWYgPSBmLnJlYWQoRlNf UkVBRF9NQVgpCkBAIC02MjgsMTEgKzYyNywxMSBAQCBkZWYgcnVuX2dydWIoZmlsZSwgZW50cnks IGZzLCBjZmdfYXJncyk6CiAgICAgaWYgbGlzdF9lbnRyaWVzOgogICAgICAgICBmb3IgaSBpbiBy YW5nZShsZW4oZy5jZi5pbWFnZXMpKToKICAgICAgICAgICAgIGltZyA9IGcuY2YuaW1hZ2VzW2ld Ci0gICAgICAgICAgICBwcmludCAidGl0bGU6ICVzIiAlIGltZy50aXRsZQotICAgICAgICAgICAg cHJpbnQgIiAgcm9vdDogJXMiICUgaW1nLnJvb3QKLSAgICAgICAgICAgIHByaW50ICIgIGtlcm5l bDogJXMiICUgaW1nLmtlcm5lbFsxXQotICAgICAgICAgICAgcHJpbnQgIiAgYXJnczogJXMiICUg aW1nLmFyZ3MKLSAgICAgICAgICAgIHByaW50ICIgIGluaXRyZDogJXMiICUgaW1nLmluaXRyZFsx XQorICAgICAgICAgICAgcHJpbnQoInRpdGxlOiAlcyIgJSBpbWcudGl0bGUpCisgICAgICAgICAg ICBwcmludCgiICByb290OiAlcyIgJSBpbWcucm9vdCkKKyAgICAgICAgICAgIHByaW50KCIgIGtl cm5lbDogJXMiICUgaW1nLmtlcm5lbFsxXSkKKyAgICAgICAgICAgIHByaW50KCIgIGFyZ3M6ICVz IiAlIGltZy5hcmdzKQorICAgICAgICAgICAgcHJpbnQoIiAgaW5pdHJkOiAlcyIgJSBpbWcuaW5p dHJkWzFdKQogCiAgICAgaWYgaW50ZXJhY3RpdmUgYW5kIG5vdCBsaXN0X2VudHJpZXM6CiAgICAg ICAgIGN1cnNlcy53cmFwcGVyKHJ1bl9tYWluKQpAQCAtNjQ2LDcgKzY0NSw3IEBAIGRlZiBydW5f Z3J1YihmaWxlLCBlbnRyeSwgZnMsIGNmZ19hcmdzKToKICAgICAgICAgICAgc2VsID0gaWR4CiAK ICAgICBpZiBzZWwgPT0gLTE6Ci0gICAgICAgIHByaW50ICJObyBrZXJuZWwgaW1hZ2Ugc2VsZWN0 ZWQhIgorICAgICAgICBwcmludCgiTm8ga2VybmVsIGltYWdlIHNlbGVjdGVkISIpCiAgICAgICAg IHN5cy5leGl0KDEpCiAKICAgICB0cnk6CkBAIC03MzEsNyArNzMwLDcgQEAgZGVmIGZvcm1hdF9z eHAoa2VybmVsLCByYW1kaXNrLCBhcmdzKToKIGRlZiBmb3JtYXRfc2ltcGxlKGtlcm5lbCwgcmFt ZGlzaywgYXJncywgc2VwKToKICAgICBmb3IgY2hlY2sgaW4gKGtlcm5lbCwgcmFtZGlzaywgYXJn cyk6CiAgICAgICAgIGlmIGNoZWNrIGlzIG5vdCBOb25lIGFuZCBzZXAgaW4gY2hlY2s6Ci0gICAg ICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJzaW1wbGUgZm9ybWF0IGNhbm5vdCByZXByZXNl bnQgZGVsaW1pdGVyLWNvbnRhaW5pbmcgdmFsdWUiCisgICAgICAgICAgICByYWlzZSBSdW50aW1l RXJyb3IoInNpbXBsZSBmb3JtYXQgY2Fubm90IHJlcHJlc2VudCBkZWxpbWl0ZXItY29udGFpbmlu ZyB2YWx1ZSIpCiAgICAgcyA9ICgia2VybmVsICVzIiAlIGtlcm5lbCkgKyBzZXAKICAgICBpZiBy YW1kaXNrOgogICAgICAgICBzICs9ICgicmFtZGlzayAlcyIgJSByYW1kaXNrKSArIHNlcApAQCAt NzQ0LDcgKzc0Myw3IEBAIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgc2VsID0gTm9u ZQogICAgIAogICAgIGRlZiB1c2FnZSgpOgotICAgICAgICBwcmludCA+PiBzeXMuc3RkZXJyLCAi VXNhZ2U6ICVzIFstcXwtLXF1aWV0XSBbLWl8LS1pbnRlcmFjdGl2ZV0gWy1sfC0tbGlzdC1lbnRy aWVzXSBbLW58LS1ub3QtcmVhbGx5XSBbLS1vdXRwdXQ9XSBbLS1rZXJuZWw9XSBbLS1yYW1kaXNr PV0gWy0tYXJncz1dIFstLWVudHJ5PV0gWy0tb3V0cHV0LWRpcmVjdG9yeT1dIFstLW91dHB1dC1m b3JtYXQ9c3hwfHNpbXBsZXxzaW1wbGUwXSBbLS1vZmZzZXQ9XSA8aW1hZ2U+IiAlKHN5cy5hcmd2 WzBdLCkKKyAgICAgICAgcHJpbnQoIlVzYWdlOiAlcyBbLXF8LS1xdWlldF0gWy1pfC0taW50ZXJh Y3RpdmVdIFstbHwtLWxpc3QtZW50cmllc10gWy1ufC0tbm90LXJlYWxseV0gWy0tb3V0cHV0PV0g Wy0ta2VybmVsPV0gWy0tcmFtZGlzaz1dIFstLWFyZ3M9XSBbLS1lbnRyeT1dIFstLW91dHB1dC1k aXJlY3Rvcnk9XSBbLS1vdXRwdXQtZm9ybWF0PXN4cHxzaW1wbGV8c2ltcGxlMF0gWy0tb2Zmc2V0 PV0gPGltYWdlPiIgJShzeXMuYXJndlswXSwpLCBmaWxlPXN5cy5zdGRlcnIpCiAKICAgICBkZWYg Y29weV9mcm9tX2ltYWdlKGZzLCBmaWxlX3RvX3JlYWQsIGZpbGVfdHlwZSwgb3V0cHV0X2RpcmVj dG9yeSwKICAgICAgICAgICAgICAgICAgICAgICAgIG5vdF9yZWFsbHkpOgpAQCAtNzU1LDggKzc1 NCw4IEBAIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgICAgICAgICAgICAgc3lzLmV4 aXQoIlRoZSByZXF1ZXN0ZWQgJXMgZmlsZSBkb2VzIG5vdCBleGlzdCIgJSBmaWxlX3R5cGUpCiAg ICAgICAgIHRyeToKICAgICAgICAgICAgIGRhdGFmaWxlID0gZnMub3Blbl9maWxlKGZpbGVfdG9f cmVhZCkKLSAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiwgZToKLSAgICAgICAgICAgIHByaW50ID4+ c3lzLnN0ZGVyciwgZQorICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CisgICAgICAgICAg ICBwcmludChlLCBmaWxlPXN5cy5zdGRlcnIpCiAgICAgICAgICAgICBzeXMuZXhpdCgiRXJyb3Ig b3BlbmluZyAlcyBpbiBndWVzdCIgJSBmaWxlX3RvX3JlYWQpCiAgICAgICAgICh0ZmQsIHJldCkg PSB0ZW1wZmlsZS5ta3N0ZW1wKHByZWZpeD0iYm9vdF8iK2ZpbGVfdHlwZSsiLiIsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcj1vdXRwdXRfZGlyZWN0b3J5KQpAQCAt NzY5LDggKzc2OCw4IEBAIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgICAgICAgICAg ICAgcmV0dXJuIHJldAogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIG9zLndyaXRl KHRmZCwgZGF0YSkKLSAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24sIGU6Ci0gICAgICAgICAg ICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCBlCisgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9u IGFzIGU6CisgICAgICAgICAgICAgICAgcHJpbnQoZSwgZmlsZT1zeXMuc3RkZXJyKQogICAgICAg ICAgICAgICAgIG9zLmNsb3NlKHRmZCkKICAgICAgICAgICAgICAgICBvcy51bmxpbmsocmV0KQog ICAgICAgICAgICAgICAgIGRlbCBkYXRhZmlsZQpAQCAtODM0LDcgKzgzMyw3IEBAIGlmIF9fbmFt ZV9fID09ICJfX21haW5fXyI6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgcGFy dF9vZmZzID0gWyBpbnQoYSkgXQogICAgICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3I6Ci0gICAg ICAgICAgICAgICAgcHJpbnQgIm9mZnNldCB2YWx1ZSBtdXN0IGJlIGFuIGludGVnZXIiCisgICAg ICAgICAgICAgICAgcHJpbnQoIm9mZnNldCB2YWx1ZSBtdXN0IGJlIGFuIGludGVnZXIiKQogICAg ICAgICAgICAgICAgIHVzYWdlKCkKICAgICAgICAgICAgICAgICBzeXMuZXhpdCgxKQogICAgICAg ICBlbGlmIG8gaW4gKCItLWVudHJ5IiwpOgpAQCAtODQ3LDEzICs4NDYsMTMgQEAgaWYgX19uYW1l X18gPT0gIl9fbWFpbl9fIjoKICAgICAgICAgICAgIGRlYnVnID0gVHJ1ZQogICAgICAgICBlbGlm IG8gaW4gKCItLW91dHB1dC1mb3JtYXQiLCk6CiAgICAgICAgICAgICBpZiBhIG5vdCBpbiBbInN4 cCIsICJzaW1wbGUiLCAic2ltcGxlMCJdOgotICAgICAgICAgICAgICAgIHByaW50ICJ1bmtub3du IG91dHB1dCBmb3JtYXQgJXMiICUgYQorICAgICAgICAgICAgICAgIHByaW50KCJ1bmtub3duIG91 dHB1dCBmb3JtYXQgJXMiICUgYSkKICAgICAgICAgICAgICAgICB1c2FnZSgpCiAgICAgICAgICAg ICAgICAgc3lzLmV4aXQoMSkKICAgICAgICAgICAgIG91dHB1dF9mb3JtYXQgPSBhCiAgICAgICAg IGVsaWYgbyBpbiAoIi0tb3V0cHV0LWRpcmVjdG9yeSIsKToKICAgICAgICAgICAgIGlmIG5vdCBv cy5wYXRoLmlzZGlyKGEpOgotICAgICAgICAgICAgICAgIHByaW50ICIlcyBpcyBub3QgYW4gZXhp c3RpbmcgZGlyZWN0b3J5IiAlIGEKKyAgICAgICAgICAgICAgICBwcmludCgiJXMgaXMgbm90IGFu IGV4aXN0aW5nIGRpcmVjdG9yeSIgJSBhKQogICAgICAgICAgICAgICAgIHN5cy5leGl0KDEpCiAg ICAgICAgICAgICBvdXRwdXRfZGlyZWN0b3J5ID0gYQogCkBAIC04NjIsOCArODYxLDggQEAgaWYg X19uYW1lX18gPT0gIl9fbWFpbl9fIjoKIAogCiAgICAgdHJ5OgotICAgICAgICBvcy5tYWtlZGly cyhvdXRwdXRfZGlyZWN0b3J5LCAwNzAwKQotICAgIGV4Y2VwdCBPU0Vycm9yLGU6CisgICAgICAg IG9zLm1ha2VkaXJzKG91dHB1dF9kaXJlY3RvcnksIDBvNzAwKQorICAgIGV4Y2VwdCBPU0Vycm9y IGFzIGU6CiAgICAgICAgIGlmIChlLmVycm5vID09IGVycm5vLkVFWElTVCkgYW5kIG9zLnBhdGgu aXNkaXIob3V0cHV0X2RpcmVjdG9yeSk6CiAgICAgICAgICAgICBwYXNzCiAgICAgICAgIGVsc2U6 CkBAIC04NzcsMTAgKzg3NiwxMCBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgICMg ZGVidWcKICAgICBpZiBpc2NvbmZpZzoKICAgICAgICAgY2hvc2VuY2ZnID0gcnVuX2dydWIoZmls ZSwgZW50cnksIGZzLCBpbmNmZ1siYXJncyJdKQotICAgICAgICBwcmludCAiICBrZXJuZWw6ICVz IiAlIGNob3NlbmNmZ1sia2VybmVsIl0KKyAgICAgICAgcHJpbnQoIiAga2VybmVsOiAlcyIgJSBj aG9zZW5jZmdbImtlcm5lbCJdKQogICAgICAgICBpZiBjaG9zZW5jZmdbInJhbWRpc2siXToKLSAg ICAgICAgICAgIHByaW50ICIgIGluaXRyZDogJXMiICUgY2hvc2VuY2ZnWyJyYW1kaXNrIl0KLSAg ICAgICAgcHJpbnQgIiAgYXJnczogJXMiICUgY2hvc2VuY2ZnWyJhcmdzIl0KKyAgICAgICAgICAg IHByaW50KCIgIGluaXRyZDogJXMiICUgY2hvc2VuY2ZnWyJyYW1kaXNrIl0pCisgICAgICAgIHBy aW50KCIgIGFyZ3M6ICVzIiAlIGNob3NlbmNmZ1siYXJncyJdKQogICAgICAgICBzeXMuZXhpdCgw KQogCiAgICAgIyBpZiBib290IGZpbGVzeXN0ZW0gaXMgc2V0IHRoZW4gcGFzcyB0byBmc2ltYWdl Lm9wZW4KQEAgLTkyNiw3ICs5MjUsNyBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogCiAg ICAgIyBEaWQgbG9vcGluZyB0aHJvdWdoIHBhcnRpdGlvbnMgZmluZCB1cyBhIGtlcm5lbD8KICAg ICBpZiBmcyBpcyBOb25lOgotICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJVbmFibGUgdG8g ZmluZCBwYXJ0aXRpb24gY29udGFpbmluZyBrZXJuZWwiCisgICAgICAgIHJhaXNlIFJ1bnRpbWVF cnJvcigiVW5hYmxlIHRvIGZpbmQgcGFydGl0aW9uIGNvbnRhaW5pbmcga2VybmVsIikKIAogICAg IGJvb3RjZmdbImtlcm5lbCJdID0gY29weV9mcm9tX2ltYWdlKGZzLCBjaG9zZW5jZmdbImtlcm5l bCJdLCAia2VybmVsIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBv dXRwdXRfZGlyZWN0b3J5LCBub3RfcmVhbGx5KQotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApY ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9y Zy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==