101090 2012-11-02 12:53:39 -0700 webkitpy: clean up logging in common.system.autoinstall 2012-11-02 13:55:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan webkit.review.bot oldest_to_newest 757496 0 dpranke 2012-11-02 12:53:39 -0700 webkitpy: clean up logging in common.system.autoinstall 757499 1 172115 dpranke 2012-11-02 12:54:58 -0700 Created attachment 172115 Patch 757516 2 172115 ojan 2012-11-02 13:17:01 -0700 Comment on attachment 172115 Patch This has bugged me everytime I've run with --verbose. 757548 3 172115 webkit.review.bot 2012-11-02 13:55:24 -0700 Comment on attachment 172115 Patch Clearing flags on attachment: 172115 Committed r133340: <http://trac.webkit.org/changeset/133340> 757549 4 webkit.review.bot 2012-11-02 13:55:28 -0700 All reviewed patches have been landed. Closing bug. 172115 2012-11-02 12:54:58 -0700 2012-11-02 13:55:24 -0700 Patch bug-101090-20121102125317.patch text/plain 13259 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjNjZWZkY2ExMmVkODk0OGJmM2I3NmQzMjhkMTRkZmM2 ZjQwNWNhYS4uY2Y4YTA4NDVhYmJkOGY1YzMzN2VkNGVhODE0MGFhODU3YTc5ZGM4MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1 IEBACiAyMDEyLTExLTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBjbGVhbiB1cCBsb2dnaW5nIGluIGNvbW1vbi5zeXN0ZW0uYXV0b2lu c3RhbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw MTA5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgbW9kdWxlIGxvZ2dlZCB3YXkgdG9vIG11Y2gsIG11Y2ggb2Ygd2hpY2ggd2FzIGxvZ2dpbmcg dGhhdAorICAgICAgICB3YXMgZWl0aGVyIHJlYWxseSByZWR1bmRhbnQgb3IgdXNlZnVsIG9ubHkg ZHVyaW5nIGluaXRpYWwgZGV2ZWxvcG1lbnQuCisgICAgICAgIFRoaXMgcGF0Y2ggZGVsZXRlcyBh IGxvdCBvZiBjb2RlIGFuZCB0d2Vha3MgdGhlIHJlbWFpbmluZyBsb2cgbWVzc2FnZXMKKyAgICAg ICAgdG8gYmUgbW9yZSB1c2VmdWwgbm93LgorCisgICAgICAgIEFsc28sIGNsZWFuIHVwIGEgYnVu Y2ggb2YgbGludCBlcnJvcnMgYW5kIHdhcm5pbmdzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL2F1dG9pbnN0YWxsLnB5OgorICAgICAgICAoQXV0b0luc3RhbGxl ci5fX2luaXRfXyk6CisgICAgICAgIChBdXRvSW5zdGFsbGVyLl93cml0ZV9maWxlKToKKyAgICAg ICAgKEF1dG9JbnN0YWxsZXIuX3NldF91cF90YXJnZXRfZGlyKToKKyAgICAgICAgKEF1dG9JbnN0 YWxsZXIuX2NyZWF0ZV9zY3JhdGNoX2RpcmVjdG9yeSk6CisgICAgICAgIChBdXRvSW5zdGFsbGVy Ll91cmxfZG93bmxvYWRlZF9wYXRoKToKKyAgICAgICAgKEF1dG9JbnN0YWxsZXIuX2lzX2Rvd25s b2FkZWQpOgorICAgICAgICAoQXV0b0luc3RhbGxlci5fcmVjb3JkX3VybF9kb3dubG9hZGVkKToK KyAgICAgICAgKEF1dG9JbnN0YWxsZXIuX2V4dHJhY3RfdGFyZ3opOgorICAgICAgICAoQXV0b0lu c3RhbGxlci5fZXh0cmFjdF9hbGwpOgorICAgICAgICAoQXV0b0luc3RhbGxlci5fdW56aXApOgor ICAgICAgICAoQXV0b0luc3RhbGxlci5fZG93bmxvYWRfdG9fc3RyZWFtKToKKyAgICAgICAgKEF1 dG9JbnN0YWxsZXIuX2Rvd25sb2FkKToKKyAgICAgICAgKEF1dG9JbnN0YWxsZXIuX2luc3RhbGwp OgorICAgICAgICAoQXV0b0luc3RhbGxlci5pbnN0YWxsKToKKworMjAxMi0xMS0wMiAgRGlyayBQ cmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXQtcGF0Y2ggYW5h bHl6ZS1iYXNlbGluZXMgb3V0cHV0IGlzIHdlYWsKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDk5OAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vYXV0b2luc3RhbGwucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vYXV0b2luc3RhbGwucHkKaW5kZXggMDBhZmY4M2ZmYWIyYmFh YzliMzc5NjM5OTA1OGUzZGY4ZDQ2OGU1Zi4uNzY3YThhNTFkNjIxNTA3MzljOGUwNzFjMzc4ODMz NmQyYzI0ODE3YiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL2F1dG9pbnN0YWxsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5 c3RlbS9hdXRvaW5zdGFsbC5weQpAQCAtMzMsNyArMzMsNiBAQAogCiBpbXBvcnQgY29kZWNzCiBp bXBvcnQgbG9nZ2luZwotaW1wb3J0IG5ldwogaW1wb3J0IG9zCiBpbXBvcnQgc2h1dGlsCiBpbXBv cnQgc3lzCkBAIC00Miw3ICs0MSw2IEBAIGltcG9ydCB0ZW1wZmlsZQogaW1wb3J0IHVybGxpYgog aW1wb3J0IHVybHBhcnNlCiBpbXBvcnQgemlwZmlsZQotaW1wb3J0IHppcGltcG9ydAogCiBfbG9n ID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKQEAgLTk3LDM1ICs5NSw5IEBAIGNsYXNz IEF1dG9JbnN0YWxsZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fdGFyZ2V0X2RpciA9IHRhcmdl dF9kaXIKICAgICAgICAgc2VsZi5fdGVtcF9kaXIgPSB0ZW1wX2RpcgogCi0gICAgZGVmIF9sb2df dHJhbnNmZXIoc2VsZiwgbWVzc2FnZSwgc291cmNlLCB0YXJnZXQsIGxvZ19tZXRob2Q9Tm9uZSk6 Ci0gICAgICAgICIiIkxvZyBhIGRlYnVnIG1lc3NhZ2UgdGhhdCBpbnZvbHZlcyBhIHNvdXJjZSBh bmQgdGFyZ2V0LiIiIgotICAgICAgICBpZiBsb2dfbWV0aG9kIGlzIE5vbmU6Ci0gICAgICAgICAg ICBsb2dfbWV0aG9kID0gX2xvZy5kZWJ1ZwotCi0gICAgICAgIGxvZ19tZXRob2QoIiVzIiAlIG1l c3NhZ2UpCi0gICAgICAgIGxvZ19tZXRob2QoJyAgICBGcm9tOiAiJXMiJyAlIHNvdXJjZSkKLSAg ICAgICAgbG9nX21ldGhvZCgnICAgICAgVG86ICIlcyInICUgdGFyZ2V0KQotCi0gICAgZGVmIF9j cmVhdGVfZGlyZWN0b3J5KHNlbGYsIHBhdGgsIG5hbWU9Tm9uZSk6Ci0gICAgICAgICIiIkNyZWF0 ZSBhIGRpcmVjdG9yeS4iIiIKLSAgICAgICAgbG9nID0gX2xvZy5kZWJ1ZwotCi0gICAgICAgIG5h bWUgPSBuYW1lICsgIiAiIGlmIG5hbWUgaXMgbm90IE5vbmUgZWxzZSAiIgotICAgICAgICBsb2co J0NyZWF0aW5nICVzZGlyZWN0b3J5Li4uJyAlIG5hbWUpCi0gICAgICAgIGxvZygnICAgICIlcyIn ICUgcGF0aCkKLQotICAgICAgICBvcy5tYWtlZGlycyhwYXRoKQotCiAgICAgZGVmIF93cml0ZV9m aWxlKHNlbGYsIHBhdGgsIHRleHQsIGVuY29kaW5nKToKLSAgICAgICAgIiIiQ3JlYXRlIGEgZmls ZSBhdCB0aGUgZ2l2ZW4gcGF0aCB3aXRoIGdpdmVuIHRleHQuCi0KLSAgICAgICAgVGhpcyBtZXRo b2Qgb3ZlcndyaXRlcyBhbnkgZXhpc3RpbmcgZmlsZS4KLQotICAgICAgICAiIiIKLSAgICAgICAg X2xvZy5kZWJ1ZygiQ3JlYXRpbmcgZmlsZS4uLiIpCi0gICAgICAgIF9sb2cuZGVidWcoJyAgICAi JXMiJyAlIHBhdGgpCi0gICAgICAgIHdpdGggY29kZWNzLm9wZW4ocGF0aCwgInciLCBlbmNvZGlu ZykgYXMgZmlsZToKLSAgICAgICAgICAgIGZpbGUud3JpdGUodGV4dCkKKyAgICAgICAgd2l0aCBj b2RlY3Mub3BlbihwYXRoLCAidyIsIGVuY29kaW5nKSBhcyBmaWxlaGFuZGxlOgorICAgICAgICAg ICAgZmlsZWhhbmRsZS53cml0ZSh0ZXh0KQogCiAgICAgZGVmIF9zZXRfdXBfdGFyZ2V0X2Rpcihz ZWxmLCB0YXJnZXRfZGlyLCBhcHBlbmRfdG9fc2VhcmNoX3BhdGgsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtYWtlX3BhY2thZ2UpOgpAQCAtMTQzLDcgKzExNSw3IEBAIGNsYXNzIEF1dG9J bnN0YWxsZXIob2JqZWN0KToKIAogICAgICAgICAiIiIKICAgICAgICAgaWYgbm90IG9zLnBhdGgu ZXhpc3RzKHRhcmdldF9kaXIpOgotICAgICAgICAgICAgc2VsZi5fY3JlYXRlX2RpcmVjdG9yeSh0 YXJnZXRfZGlyLCAiYXV0b2luc3RhbGwgdGFyZ2V0IikKKyAgICAgICAgICAgIG9zLm1ha2VkaXJz KHRhcmdldF9kaXIpCiAKICAgICAgICAgaWYgYXBwZW5kX3RvX3NlYXJjaF9wYXRoOgogICAgICAg ICAgICAgc3lzLnBhdGguYXBwZW5kKHRhcmdldF9kaXIpCkBAIC0xOTIsNTEgKzE2NCwzMiBAQCBj bGFzcyBBdXRvSW5zdGFsbGVyKG9iamVjdCk6CiAgICAgICAgICAgICBpZiB0ZW1wX2RpciBpcyBO b25lIG9yIG9zLnBhdGguZXhpc3RzKHRlbXBfZGlyKToKICAgICAgICAgICAgICAgICByYWlzZQog ICAgICAgICAgICAgIyBFbHNlIHRyeSBhZ2FpbiBhZnRlciBjcmVhdGluZyB0aGUgdGVtcCBkaXJl Y3RvcnkuCi0gICAgICAgICAgICBzZWxmLl9jcmVhdGVfZGlyZWN0b3J5KHRlbXBfZGlyLCAiYXV0 b2luc3RhbGwgdGVtcCIpCisgICAgICAgICAgICBvcy5tYWtlZGlycyh0ZW1wX2RpcikKICAgICAg ICAgICAgIHNjcmF0Y2hfZGlyID0gc2VsZi5fY3JlYXRlX3NjcmF0Y2hfZGlyZWN0b3J5X2lubmVy KHByZWZpeCkKIAogICAgICAgICByZXR1cm4gc2NyYXRjaF9kaXIKIAogICAgIGRlZiBfdXJsX2Rv d25sb2FkZWRfcGF0aChzZWxmLCB0YXJnZXRfbmFtZSk6Ci0gICAgICAgICIiIlJldHVybiB0aGUg cGF0aCB0byB0aGUgZmlsZSBjb250YWluaW5nIHRoZSBVUkwgZG93bmxvYWRlZC4iIiIKLSAgICAg ICAgZmlsZW5hbWUgPSAiLiVzLnVybCIgJSB0YXJnZXRfbmFtZQotICAgICAgICBwYXRoID0gb3Mu cGF0aC5qb2luKHNlbGYuX3RhcmdldF9kaXIsIGZpbGVuYW1lKQotICAgICAgICByZXR1cm4gcGF0 aAorICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYuX3RhcmdldF9kaXIsICIuJXMudXJs IiAlIHRhcmdldF9uYW1lKQogCiAgICAgZGVmIF9pc19kb3dubG9hZGVkKHNlbGYsIHRhcmdldF9u YW1lLCB1cmwpOgotICAgICAgICAiIiJSZXR1cm4gd2hldGhlciBhIHBhY2thZ2UgdmVyc2lvbiBo YXMgYmVlbiBkb3dubG9hZGVkLiIiIgogICAgICAgICB2ZXJzaW9uX3BhdGggPSBzZWxmLl91cmxf ZG93bmxvYWRlZF9wYXRoKHRhcmdldF9uYW1lKQogCi0gICAgICAgIF9sb2cuZGVidWcoJ0NoZWNr aW5nICVzIFVSTCBkb3dubG9hZGVkLi4uJyAlIHRhcmdldF9uYW1lKQotICAgICAgICBfbG9nLmRl YnVnKCcgICAgIiVzIicgJSB2ZXJzaW9uX3BhdGgpCi0KICAgICAgICAgaWYgbm90IG9zLnBhdGgu ZXhpc3RzKHZlcnNpb25fcGF0aCk6Ci0gICAgICAgICAgICAjIFRoZW4gbm8gcGFja2FnZSB2ZXJz aW9uIGhhcyBiZWVuIGRvd25sb2FkZWQuCi0gICAgICAgICAgICBfbG9nLmRlYnVnKCJObyBVUkwg ZmlsZSBmb3VuZC4iKQogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKLSAgICAgICAgd2l0aCBj b2RlY3Mub3Blbih2ZXJzaW9uX3BhdGgsICJyIiwgInV0Zi04IikgYXMgZmlsZToKLSAgICAgICAg ICAgIHZlcnNpb24gPSBmaWxlLnJlYWQoKQotCi0gICAgICAgIHJldHVybiB2ZXJzaW9uLnN0cmlw KCkgPT0gdXJsLnN0cmlwKCkKKyAgICAgICAgd2l0aCBjb2RlY3Mub3Blbih2ZXJzaW9uX3BhdGgs ICJyIiwgInV0Zi04IikgYXMgZmlsZWhhbmRsZToKKyAgICAgICAgICAgIHJldHVybiBmaWxlaGFu ZGxlLnJlYWQoKS5zdHJpcCgpID09IHVybC5zdHJpcCgpCiAKICAgICBkZWYgX3JlY29yZF91cmxf ZG93bmxvYWRlZChzZWxmLCB0YXJnZXRfbmFtZSwgdXJsKToKLSAgICAgICAgIiIiUmVjb3JkIHRo ZSBVUkwgZG93bmxvYWRlZCB0byBhIGZpbGUuIiIiCiAgICAgICAgIHZlcnNpb25fcGF0aCA9IHNl bGYuX3VybF9kb3dubG9hZGVkX3BhdGgodGFyZ2V0X25hbWUpCi0gICAgICAgIF9sb2cuZGVidWco IlJlY29yZGluZyBVUkwgZG93bmxvYWRlZC4uLiIpCi0gICAgICAgIF9sb2cuZGVidWcoJyAgICBV Ukw6ICIlcyInICUgdXJsKQotICAgICAgICBfbG9nLmRlYnVnKCcgICAgIFRvOiAiJXMiJyAlIHZl cnNpb25fcGF0aCkKLQogICAgICAgICBzZWxmLl93cml0ZV9maWxlKHZlcnNpb25fcGF0aCwgdXJs LCAidXRmLTgiKQogCiAgICAgZGVmIF9leHRyYWN0X3Rhcmd6KHNlbGYsIHBhdGgsIHNjcmF0Y2hf ZGlyKToKLSAgICAgICAgIyB0YXJmaWxlLmV4dHJhY3RhbGwoKSBleHRyYWN0cyB0byBhIHBhdGgg d2l0aG91dCB0aGUKLSAgICAgICAgIyB0cmFpbGluZyAiLnRhci5neiIuCisgICAgICAgICMgdGFy ZmlsZS5leHRyYWN0YWxsKCkgZXh0cmFjdHMgdG8gYSBwYXRoIHdpdGhvdXQgdGhlIHRyYWlsaW5n ICIudGFyLmd6Ii4KICAgICAgICAgdGFyZ2V0X2Jhc2VuYW1lID0gb3MucGF0aC5iYXNlbmFtZShw YXRoWzotbGVuKCIudGFyLmd6IildKQogICAgICAgICB0YXJnZXRfcGF0aCA9IG9zLnBhdGguam9p bihzY3JhdGNoX2RpciwgdGFyZ2V0X2Jhc2VuYW1lKQogCi0gICAgICAgIHNlbGYuX2xvZ190cmFu c2ZlcigiU3RhcnRpbmcgZ3VuemlwL2V4dHJhY3QuLi4iLCBwYXRoLCB0YXJnZXRfcGF0aCkKLQog ICAgICAgICB0cnk6CiAgICAgICAgICAgICB0YXJfZmlsZSA9IHRhcmZpbGUub3BlbihwYXRoKQog ICAgICAgICBleGNlcHQgdGFyZmlsZS5SZWFkRXJyb3IsIGVycjoKQEAgLTI0OCwxMSArMjAxLDYg QEAgY2xhc3MgQXV0b0luc3RhbGxlcihvYmplY3QpOgogICAgICAgICAgICAgcmFpc2UgRXhjZXB0 aW9uKG1lc3NhZ2UpCiAKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgIyBUaGlzIGlzIGhlbHBm dWwgZm9yIGRlYnVnZ2luZyBwdXJwb3Nlcy4KLSAgICAgICAgICAgIF9sb2cuZGVidWcoIkxpc3Rp bmcgdGFyIGZpbGUgY29udGVudHMuLi4iKQotICAgICAgICAgICAgZm9yIG5hbWUgaW4gdGFyX2Zp bGUuZ2V0bmFtZXMoKToKLSAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCcgICAgKiAiJXMiJyAl IG5hbWUpCi0gICAgICAgICAgICBfbG9nLmRlYnVnKCJFeHRyYWN0aW5nIGd6aXBwZWQgdGFyIGZp bGUuLi4iKQogICAgICAgICAgICAgdGFyX2ZpbGUuZXh0cmFjdGFsbCh0YXJnZXRfcGF0aCkKICAg ICAgICAgZmluYWxseToKICAgICAgICAgICAgIHRhcl9maWxlLmNsb3NlKCkKQEAgLTI2MywzMyAr MjExLDIzIEBAIGNsYXNzIEF1dG9JbnN0YWxsZXIob2JqZWN0KToKICAgICAjIGF2YWlsYWJsZSBp biBQeXRob24gMi42IGJ1dCBub3QgaW4gZWFybGllciB2ZXJzaW9ucy4KICAgICAjIE5PVEU6IFRo ZSB2ZXJzaW9uIGluIDIuNi4xICh3aGljaCBzaGlwcGVkIG9uIFNub3cgTGVvcGFyZCkgaXMgYnJv a2VuIQogICAgIGRlZiBfZXh0cmFjdF9hbGwoc2VsZiwgemlwX2ZpbGUsIHRhcmdldF9kaXIpOgot ICAgICAgICBzZWxmLl9sb2dfdHJhbnNmZXIoIkV4dHJhY3RpbmcgemlwIGZpbGUuLi4iLCB6aXBf ZmlsZSwgdGFyZ2V0X2RpcikKLQotICAgICAgICAjIFRoaXMgaXMgaGVscGZ1bCBmb3IgZGVidWdn aW5nIHB1cnBvc2VzLgotICAgICAgICBfbG9nLmRlYnVnKCJMaXN0aW5nIHppcCBmaWxlIGNvbnRl bnRzLi4uIikKLSAgICAgICAgZm9yIG5hbWUgaW4gemlwX2ZpbGUubmFtZWxpc3QoKToKLSAgICAg ICAgICAgIF9sb2cuZGVidWcoJyAgICAqICIlcyInICUgbmFtZSkKLQogICAgICAgICBmb3IgbmFt ZSBpbiB6aXBfZmlsZS5uYW1lbGlzdCgpOgogICAgICAgICAgICAgcGF0aCA9IG9zLnBhdGguam9p bih0YXJnZXRfZGlyLCBuYW1lKQotICAgICAgICAgICAgc2VsZi5fbG9nX3RyYW5zZmVyKCJFeHRy YWN0aW5nLi4uIiwgbmFtZSwgcGF0aCkKLQogICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguYmFz ZW5hbWUocGF0aCk6CiAgICAgICAgICAgICAgICAgIyBUaGVuIHRoZSBwYXRoIGVuZHMgaW4gYSBz bGFzaCwgc28gaXQgaXMgYSBkaXJlY3RvcnkuCi0gICAgICAgICAgICAgICAgc2VsZi5fY3JlYXRl X2RpcmVjdG9yeShwYXRoKQorICAgICAgICAgICAgICAgIG9zLm1ha2VkaXJzKHBhdGgpCiAgICAg ICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgICAgICMgT3RoZXJ3aXNlLCBpdCBpcyBhIGZp bGUuCiAKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICAjIFdlIG9wZW4gdGhpcyBm aWxlIHcvbyBlbmNvZGluZywgYXMgd2UncmUgcmVhZGluZy93cml0aW5nCiAgICAgICAgICAgICAg ICAgIyB0aGUgcmF3IGJ5dGUtc3RyZWFtIGZyb20gdGhlIHppcCBmaWxlLgogICAgICAgICAgICAg ICAgIG91dGZpbGUgPSBvcGVuKHBhdGgsICd3YicpCi0gICAgICAgICAgICBleGNlcHQgSU9FcnJv ciwgZXJyOgorICAgICAgICAgICAgZXhjZXB0IElPRXJyb3I6CiAgICAgICAgICAgICAgICAgIyBO b3QgYWxsIHppcCBmaWxlcyBzZWVtIHRvIGxpc3QgdGhlIGRpcmVjdG9yaWVzIGV4cGxpY2l0bHks CiAgICAgICAgICAgICAgICAgIyBzbyB0cnkgYWdhaW4gYWZ0ZXIgY3JlYXRpbmcgdGhlIGNvbnRh aW5pbmcgZGlyZWN0b3J5LgogICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIkdvdCBJT0Vycm9y OiByZXRyeWluZyBhZnRlciBjcmVhdGluZyBkaXJlY3RvcnkuLi4iKQotICAgICAgICAgICAgICAg IGRpciA9IG9zLnBhdGguZGlybmFtZShwYXRoKQotICAgICAgICAgICAgICAgIHNlbGYuX2NyZWF0 ZV9kaXJlY3RvcnkoZGlyKQorICAgICAgICAgICAgICAgIGRpcm5hbWUgPSBvcy5wYXRoLmRpcm5h bWUocGF0aCkKKyAgICAgICAgICAgICAgICBvcy5tYWtlZGlycyhkaXJuYW1lKQogICAgICAgICAg ICAgICAgIG91dGZpbGUgPSBvcGVuKHBhdGgsICd3YicpCiAKICAgICAgICAgICAgIHRyeToKQEAg LTI5OCwxMyArMjM2LDEwIEBAIGNsYXNzIEF1dG9JbnN0YWxsZXIob2JqZWN0KToKICAgICAgICAg ICAgICAgICBvdXRmaWxlLmNsb3NlKCkKIAogICAgIGRlZiBfdW56aXAoc2VsZiwgcGF0aCwgc2Ny YXRjaF9kaXIpOgotICAgICAgICAjIHppcGZpbGUuZXh0cmFjdGFsbCgpIGV4dHJhY3RzIHRvIGEg cGF0aCB3aXRob3V0IHRoZQotICAgICAgICAjIHRyYWlsaW5nICIuemlwIi4KKyAgICAgICAgIyB6 aXBmaWxlLmV4dHJhY3RhbGwoKSBleHRyYWN0cyB0byBhIHBhdGggd2l0aG91dCB0aGUgdHJhaWxp bmcgIi56aXAiLgogICAgICAgICB0YXJnZXRfYmFzZW5hbWUgPSBvcy5wYXRoLmJhc2VuYW1lKHBh dGhbOi1sZW4oIi56aXAiKV0pCiAgICAgICAgIHRhcmdldF9wYXRoID0gb3MucGF0aC5qb2luKHNj cmF0Y2hfZGlyLCB0YXJnZXRfYmFzZW5hbWUpCiAKLSAgICAgICAgc2VsZi5fbG9nX3RyYW5zZmVy KCJTdGFydGluZyB1bnppcC4uLiIsIHBhdGgsIHRhcmdldF9wYXRoKQotCiAgICAgICAgIHRyeToK ICAgICAgICAgICAgIHppcF9maWxlID0gemlwZmlsZS5aaXBGaWxlKHBhdGgsICJyIikKICAgICAg ICAgZXhjZXB0IHppcGZpbGUuQmFkWmlwZmlsZSwgZXJyOgpAQCAtMzQ1LDcgKzI4MCw2IEBAIGNs YXNzIEF1dG9JbnN0YWxsZXIob2JqZWN0KToKICAgICAgICAgcmV0dXJuIG5ld19wYXRoCiAKICAg ICBkZWYgX2Rvd25sb2FkX3RvX3N0cmVhbShzZWxmLCB1cmwsIHN0cmVhbSk6Ci0gICAgICAgICIi IkRvd25sb2FkIGFuIFVSTCB0byBhIHN0cmVhbSwgYW5kIHJldHVybiB0aGUgbnVtYmVyIG9mIGJ5 dGVzLiIiIgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBuZXRzdHJlYW0gPSB1cmxsaWIudXJs b3Blbih1cmwpCiAgICAgICAgIGV4Y2VwdCBJT0Vycm9yLCBlcnI6CkBAIC0zNjQsMjkgKzI5OCwy MSBAQCBjbGFzcyBBdXRvSW5zdGFsbGVyKG9iamVjdCk6CiAgICAgICAgICAgICByYWlzZSBWYWx1 ZUVycm9yKCJIVFRQIEVycm9yIGNvZGUgJXMiICUgY29kZSkKIAogICAgICAgICBCVUZTSVpFID0g MioqMTMgICMgOEtCCi0gICAgICAgIGJ5dGVzID0gMAogICAgICAgICB3aGlsZSBUcnVlOgogICAg ICAgICAgICAgZGF0YSA9IG5ldHN0cmVhbS5yZWFkKEJVRlNJWkUpCiAgICAgICAgICAgICBpZiBu b3QgZGF0YToKICAgICAgICAgICAgICAgICBicmVhawogICAgICAgICAgICAgc3RyZWFtLndyaXRl KGRhdGEpCi0gICAgICAgICAgICBieXRlcyArPSBsZW4oZGF0YSkKICAgICAgICAgbmV0c3RyZWFt LmNsb3NlKCkKLSAgICAgICAgcmV0dXJuIGJ5dGVzCiAKICAgICBkZWYgX2Rvd25sb2FkKHNlbGYs IHVybCwgc2NyYXRjaF9kaXIpOgotICAgICAgICAiIiJEb3dubG9hZCBVUkwgY29udGVudHMsIGFu ZCByZXR1cm4gdGhlIGRvd25sb2FkIHBhdGguIiIiCiAgICAgICAgIHVybF9wYXRoID0gdXJscGFy c2UudXJsc3BsaXQodXJsKVsyXQogICAgICAgICB1cmxfcGF0aCA9IG9zLnBhdGgubm9ybXBhdGgo dXJsX3BhdGgpICAjIFJlbW92ZXMgdHJhaWxpbmcgc2xhc2guCiAgICAgICAgIHRhcmdldF9maWxl bmFtZSA9IG9zLnBhdGguYmFzZW5hbWUodXJsX3BhdGgpCiAgICAgICAgIHRhcmdldF9wYXRoID0g b3MucGF0aC5qb2luKHNjcmF0Y2hfZGlyLCB0YXJnZXRfZmlsZW5hbWUpCiAKLSAgICAgICAgc2Vs Zi5fbG9nX3RyYW5zZmVyKCJTdGFydGluZyBkb3dubG9hZC4uLiIsIHVybCwgdGFyZ2V0X3BhdGgp Ci0KICAgICAgICAgd2l0aCBvcGVuKHRhcmdldF9wYXRoLCAid2IiKSBhcyBzdHJlYW06Ci0gICAg ICAgICAgICBieXRlcyA9IHNlbGYuX2Rvd25sb2FkX3RvX3N0cmVhbSh1cmwsIHN0cmVhbSkKLQot ICAgICAgICBfbG9nLmRlYnVnKCJEb3dubG9hZGVkICVzIGJ5dGVzLiIgJSBieXRlcykKKyAgICAg ICAgICAgIHNlbGYuX2Rvd25sb2FkX3RvX3N0cmVhbSh1cmwsIHN0cmVhbSkKIAogICAgICAgICBy ZXR1cm4gdGFyZ2V0X3BhdGgKIApAQCAtNDA3LDE0ICszMzMsMTEgQEAgY2xhc3MgQXV0b0luc3Rh bGxlcihvYmplY3QpOgogICAgICAgICAgICAgc291cmNlX3BhdGggPSBvcy5wYXRoLmpvaW4ocGF0 aCwgdXJsX3N1YnBhdGgpCiAKICAgICAgICAgaWYgb3MucGF0aC5leGlzdHModGFyZ2V0X3BhdGgp OgotICAgICAgICAgICAgX2xvZy5kZWJ1ZygnUmVmcmVzaGluZyBpbnN0YWxsOiBkZWxldGluZyAi JXMiLicgJSB0YXJnZXRfcGF0aCkKICAgICAgICAgICAgIGlmIG9zLnBhdGguaXNkaXIodGFyZ2V0 X3BhdGgpOgogICAgICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUodGFyZ2V0X3BhdGgpCiAgICAg ICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIG9zLnJlbW92ZSh0YXJnZXRfcGF0aCkKIAot ICAgICAgICBzZWxmLl9sb2dfdHJhbnNmZXIoIk1vdmluZyBmaWxlcyBpbnRvIHBsYWNlLi4uIiwg c291cmNlX3BhdGgsIHRhcmdldF9wYXRoKQotCiAgICAgICAgICMgVGhlIHNodXRpbC5tb3ZlKCkg Y29tbWFuZCBjcmVhdGVzIGludGVybWVkaWF0ZSBkaXJlY3RvcmllcyBpZiB0aGV5CiAgICAgICAg ICMgZG8gbm90IGV4aXN0LCBidXQgd2UgZG8gbm90IHJlbHkgb24gdGhpcyBiZWhhdmlvciBzaW5j ZSB3ZQogICAgICAgICAjIG5lZWQgdG8gY3JlYXRlIHRoZSBfX2luaXRfXy5weSBmaWxlIGFueXdh eS4KQEAgLTQ1MywxMyArMzc2LDkgQEAgY2xhc3MgQXV0b0luc3RhbGxlcihvYmplY3QpOgogCiAg ICAgICAgIHRhcmdldF9wYXRoID0gb3MucGF0aC5qb2luKHNlbGYuX3RhcmdldF9kaXIsIHRhcmdl dF9uYW1lKQogICAgICAgICBpZiBub3Qgc2hvdWxkX3JlZnJlc2ggYW5kIHNlbGYuX2lzX2Rvd25s b2FkZWQodGFyZ2V0X25hbWUsIHVybCk6Ci0gICAgICAgICAgICBfbG9nLmRlYnVnKCdVUkwgZm9y ICVzIGFscmVhZHkgZG93bmxvYWRlZC4gIFNraXBwaW5nLi4uJwotICAgICAgICAgICAgICAgICAg ICAgICAlIHRhcmdldF9uYW1lKQotICAgICAgICAgICAgX2xvZy5kZWJ1ZygnICAgICIlcyInICUg dXJsKQogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKLSAgICAgICAgc2VsZi5fbG9nX3RyYW5z ZmVyKCJBdXRvLWluc3RhbGxpbmcgcGFja2FnZTogJXMiICUgdGFyZ2V0X25hbWUsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgdXJsLCB0YXJnZXRfcGF0aCwgbG9nX21ldGhvZD1fbG9nLmlu Zm8pCisgICAgICAgIF9sb2cuaW5mbygiQXV0by1pbnN0YWxsaW5nIHBhY2thZ2U6ICVzIiAlIHRh cmdldF9uYW1lKQogCiAgICAgICAgICMgVGhlIHNjcmF0Y2ggZGlyZWN0b3J5IGlzIHdoZXJlIHdl IHdpbGwgZG93bmxvYWQgYW5kIHByZXBhcmUKICAgICAgICAgIyBmaWxlcyBzcGVjaWZpYyB0byB0 aGlzIGluc3RhbGwgdW50aWwgdGhleSBhcmUgcmVhZHkgdG8gbW92ZQpAQCAtNDgwLDM4ICszOTks NyBAQCBjbGFzcyBBdXRvSW5zdGFsbGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgICAg ICUgKHRhcmdldF9uYW1lLCB0YXJnZXRfcGF0aCwgZXJyKSkKICAgICAgICAgICAgIHJhaXNlIEV4 Y2VwdGlvbihtZXNzYWdlKQogICAgICAgICBmaW5hbGx5OgotICAgICAgICAgICAgX2xvZy5kZWJ1 ZygnQ2xlYW5pbmcgdXA6IGRlbGV0aW5nICIlcyIuJyAlIHNjcmF0Y2hfZGlyKQogICAgICAgICAg ICAgc2h1dGlsLnJtdHJlZShzY3JhdGNoX2RpcikKLSAgICAgICAgX2xvZy5kZWJ1ZygnQXV0by1p bnN0YWxsZWQgJXMgdG86JyAlIHRhcmdldF9uYW1lKQorICAgICAgICBfbG9nLmRlYnVnKCdBdXRv LWluc3RhbGxlZCAlcyB0bzonICUgdXJsKQogICAgICAgICBfbG9nLmRlYnVnKCcgICAgIiVzIicg JSB0YXJnZXRfcGF0aCkKICAgICAgICAgcmV0dXJuIFRydWUKLQotCi1pZiBfX25hbWVfXz09Il9f bWFpbl9fIjoKLQotICAgICMgQ29uZmlndXJlIHRoZSBhdXRvaW5zdGFsbCBsb2dnZXIgdG8gbG9n IERFQlVHIG1lc3NhZ2VzIGZvcgotICAgICMgZGV2ZWxvcG1lbnQgdGVzdGluZyBwdXJwb3Nlcy4K LSAgICBjb25zb2xlID0gbG9nZ2luZy5TdHJlYW1IYW5kbGVyKCkKLQotICAgIGZvcm1hdHRlciA9 IGxvZ2dpbmcuRm9ybWF0dGVyKCclKG5hbWUpczogJShsZXZlbG5hbWUpLThzICUobWVzc2FnZSlz JykKLSAgICBjb25zb2xlLnNldEZvcm1hdHRlcihmb3JtYXR0ZXIpCi0gICAgX2xvZy5hZGRIYW5k bGVyKGNvbnNvbGUpCi0gICAgX2xvZy5zZXRMZXZlbChsb2dnaW5nLkRFQlVHKQotCi0gICAgIyBV c2UgYSBtb3JlIHZpc2libGUgdGVtcCBkaXJlY3RvcnkgZm9yIGRlYnVnIHB1cnBvc2VzLgotICAg IHRoaXNfZGlyID0gb3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKQotICAgIHRhcmdldF9kaXIgPSBv cy5wYXRoLmpvaW4odGhpc19kaXIsICJhdXRvaW5zdGFsbGVkIikKLSAgICB0ZW1wX2RpciA9IG9z LnBhdGguam9pbih0YXJnZXRfZGlyLCAiVGVtcCIpCi0KLSAgICBpbnN0YWxsZXIgPSBBdXRvSW5z dGFsbGVyKHRhcmdldF9kaXI9dGFyZ2V0X2RpciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRlbXBfZGlyPXRlbXBfZGlyKQotCi0gICAgaW5zdGFsbGVyLmluc3RhbGwoc2hvdWxkX3Jl ZnJlc2g9RmFsc2UsCi0gICAgICAgICAgICAgICAgICAgICAgdGFyZ2V0X25hbWU9InBlcDgucHki LAotICAgICAgICAgICAgICAgICAgICAgIHVybD0iaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNr YWdlcy9zb3VyY2UvcC9wZXA4L3BlcDgtMC41LjAudGFyLmd6I21kNT01MTJhODE4YWY5OTc5Mjkw Y2Q2MTljY2U4ZTljMmUyYiIsCi0gICAgICAgICAgICAgICAgICAgICAgdXJsX3N1YnBhdGg9InBl cDgtMC41LjAvcGVwOC5weSIpCi0gICAgaW5zdGFsbGVyLmluc3RhbGwoc2hvdWxkX3JlZnJlc2g9 RmFsc2UsCi0gICAgICAgICAgICAgICAgICAgICAgdGFyZ2V0X25hbWU9Im1lY2hhbml6ZSIsCi0g ICAgICAgICAgICAgICAgICAgICAgdXJsPSJodHRwOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2Vz L3NvdXJjZS9tL21lY2hhbml6ZS9tZWNoYW5pemUtMC4yLjQuemlwIiwKLSAgICAgICAgICAgICAg ICAgICAgICB1cmxfc3VicGF0aD0ibWVjaGFuaXplIikKLQo=