72673 2011-11-17 15:44:53 -0800 Teach TextFileReader about FileSystem 2011-11-17 15:55:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric eric abarth levin ojan webkit.review.bot oldest_to_newest 505295 0 eric 2011-11-17 15:44:53 -0800 Teach TextFileReader about FileSystem 505297 1 115701 eric 2011-11-17 15:45:58 -0800 Created attachment 115701 Patch 505304 2 115701 levin 2011-11-17 15:50:08 -0800 Comment on attachment 115701 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115701&action=review > Tools/Scripts/webkitpy/style/filereader.py:64 > + # FIXME: Although TextFileReader requires a FileSystem it circumvents it in two places! It looks like you only flagged one place with a FIXME. 505309 3 eric 2011-11-17 15:55:28 -0800 Committed r100694: <http://trac.webkit.org/changeset/100694> 115701 2011-11-17 15:45:58 -0800 2011-11-17 15:50:08 -0800 Patch bug-72673-20111117154556.patch text/plain 8605 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNjg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTY1ZTVhYTQ0MDE0NzcxNzJjOGMxMzUzOGE0OWVjN2Ux NmU1YmY0OS4uM2EyYmU1MDY4YTc2MzdjYTA0OTcyZDM1OGZjMjJhYjQ0YmEwNjc0NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDExLTExLTE3ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAorICAgICAg ICBUZWFjaCBUZXh0RmlsZVJlYWRlciBhYm91dCBGaWxlU3lzdGVtCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjY3MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHkgVGV4dEZpbGVSZWFk ZXIgZG9lc24ndCB1c2UgRmlsZVN5c3RlbQorICAgICAgICBldmVyeXdoZXJlIHlldCwgc28gd2Ug Y2FuJ3QgbW92ZSB0aGUgdW5pdHRlc3RzIHRvCisgICAgICAgIHVzaW5nIE1vY2tGaWxlU3lzdGVt LCBidXQgd2UncmUgY2xvc2UuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Zp bGVyZWFkZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxlcmVhZGVy X3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbi5weToK KworMjAxMS0xMS0xNyAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAg R2l2ZSBjaGVjay13ZWJraXQtc3R5bGUgYSBIb3N0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjY3MAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2ZpbGVyZWFkZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2ZpbGVyZWFkZXIucHkKaW5kZXggMWEyNGNiNTljNzNmMTNmODEzMzQ1ZjI1YjRhN2I0ZmEw NTZhZjYyYS4uMTE4MWFkNGQ4ZDNkY2RmNmViMmM3MTU0YjhjZGQyZDNkZGYwODczZCAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxlcmVhZGVyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsZXJlYWRlci5weQpAQCAtNTQsMTMgKzU0LDE1 IEBAIGNsYXNzIFRleHRGaWxlUmVhZGVyKG9iamVjdCk6CiAKICAgICAiIiIKIAotICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwcm9jZXNzb3IpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBmaWxlc3lz dGVtLCBwcm9jZXNzb3IpOgogICAgICAgICAiIiJDcmVhdGUgYW4gaW5zdGFuY2UuCiAKICAgICAg ICAgQXJndW1lbnRzOgogICAgICAgICAgIHByb2Nlc3NvcjogQSBQcm9jZXNzb3JCYXNlIGluc3Rh bmNlLgogCiAgICAgICAgICIiIgorICAgICAgICAjIEZJWE1FOiBBbHRob3VnaCBUZXh0RmlsZVJl YWRlciByZXF1aXJlcyBhIEZpbGVTeXN0ZW0gaXQgY2lyY3VtdmVudHMgaXQgaW4gdHdvIHBsYWNl cyEKKyAgICAgICAgc2VsZi5maWxlc3lzdGVtID0gZmlsZXN5c3RlbQogICAgICAgICBzZWxmLl9w cm9jZXNzb3IgPSBwcm9jZXNzb3IKICAgICAgICAgc2VsZi5maWxlX2NvdW50ID0gMAogICAgICAg ICBzZWxmLmRlbGV0ZV9vbmx5X2ZpbGVfY291bnQgPSAwCkBAIC04Myw2ICs4NSw3IEBAIGNsYXNz IFRleHRGaWxlUmVhZGVyKG9iamVjdCk6CiAgICAgICAgICAgICAjIChjb2RlY3MgZG9lcyBub3Qg c3VwcG9ydCBpdCBhbnl3YXkpLCBzbyB0aGUgcmVzdWx0aW5nCiAgICAgICAgICAgICAjIGxpbmVz IGNvbnRhaW4gdHJhaWxpbmcgIlxyIiBjaGFyYWN0ZXJzIGlmIHdlIGFyZSByZWFkaW5nCiAgICAg ICAgICAgICAjIGEgZmlsZSB3aXRoIENSTEYgZW5kaW5ncy4KKyAgICAgICAgICAgICMgRklYTUU6 IFRoaXMgc2hvdWxkIHVzZSBzZWxmLmZpbGVzeXN0ZW0KICAgICAgICAgICAgIGZpbGUgPSBjb2Rl Y3Mub3BlbihmaWxlX3BhdGgsICdyJywgJ3V0ZjgnLCAncmVwbGFjZScpCiAKICAgICAgICAgdHJ5 OgpAQCAtMTA4LDkgKzExMSw5IEBAIGNsYXNzIFRleHRGaWxlUmVhZGVyKG9iamVjdCk6CiAgICAg ICAgICIiIgogICAgICAgICBzZWxmLmZpbGVfY291bnQgKz0gMQogCi0gICAgICAgIGlmIG5vdCBv cy5wYXRoLmV4aXN0cyhmaWxlX3BhdGgpIGFuZCBmaWxlX3BhdGggIT0gIi0iOgorICAgICAgICBp ZiBub3Qgc2VsZi5maWxlc3lzdGVtLmV4aXN0cyhmaWxlX3BhdGgpIGFuZCBmaWxlX3BhdGggIT0g Ii0iOgogICAgICAgICAgICAgX2xvZy5lcnJvcigiRmlsZSBkb2VzIG5vdCBleGlzdDogJyVzJyIg JSBmaWxlX3BhdGgpCi0gICAgICAgICAgICBzeXMuZXhpdCgxKQorICAgICAgICAgICAgc3lzLmV4 aXQoMSkgICMgRklYTUU6IFRoaXMgc2hvdWxkIHRocm93IG9yIHJldHVybiBpbnN0ZWFkIG9mIGV4 aXRpbmcgZGlyZWN0bHkuCiAKICAgICAgICAgaWYgbm90IHNlbGYuX3Byb2Nlc3Nvci5zaG91bGRf cHJvY2VzcyhmaWxlX3BhdGgpOgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiU2tpcHBpbmcgZmls ZTogJyVzJyIgJSBmaWxlX3BhdGgpCkBAIC0xMjAsMzQgKzEyMywyMyBAQCBjbGFzcyBUZXh0Rmls ZVJlYWRlcihvYmplY3QpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBsaW5lcyA9IHNlbGYu X3JlYWRfbGluZXMoZmlsZV9wYXRoKQogICAgICAgICBleGNlcHQgSU9FcnJvciwgZXJyOgotICAg ICAgICAgICAgbWVzc2FnZSA9ICgiQ291bGQgbm90IHJlYWQgZmlsZS4gU2tpcHBpbmc6ICclcydc biAgJXMiCi0gICAgICAgICAgICAgICAgICAgICAgICUgKGZpbGVfcGF0aCwgZXJyKSkKKyAgICAg ICAgICAgIG1lc3NhZ2UgPSAoIkNvdWxkIG5vdCByZWFkIGZpbGUuIFNraXBwaW5nOiAnJXMnXG4g ICVzIiAlIChmaWxlX3BhdGgsIGVycikpCiAgICAgICAgICAgICBfbG9nLndhcm4obWVzc2FnZSkK ICAgICAgICAgICAgIHJldHVybgogCiAgICAgICAgIHNlbGYuX3Byb2Nlc3Nvci5wcm9jZXNzKGxp bmVzLCBmaWxlX3BhdGgsICoqa3dhcmdzKQogCiAgICAgZGVmIF9wcm9jZXNzX2RpcmVjdG9yeShz ZWxmLCBkaXJlY3RvcnkpOgotICAgICAgICAiIiJQcm9jZXNzIGFsbCBmaWxlcyBpbiB0aGUgZ2l2 ZW4gZGlyZWN0b3J5LCByZWN1cnNpdmVseS4KLQotICAgICAgICBBcmdzOgotICAgICAgICAgIGRp cmVjdG9yeTogQSBkaXJlY3RvcnkgcGF0aC4KLQotICAgICAgICAiIiIKKyAgICAgICAgIiIiUHJv Y2VzcyBhbGwgZmlsZXMgaW4gdGhlIGdpdmVuIGRpcmVjdG9yeSwgcmVjdXJzaXZlbHkuIiIiCisg ICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBjb25zaWRlciBtb3ZpbmcgdG8gc2VsZi5maWxlc3lz dGVtLmZpbGVzX3VuZGVyKCkgKG9yIGFkZGluZyB3YWxrKCkgdG8gRmlsZVN5c3RlbSkKICAgICAg ICAgZm9yIGRpcl9wYXRoLCBkaXJfbmFtZXMsIGZpbGVfbmFtZXMgaW4gb3Mud2FsayhkaXJlY3Rv cnkpOgogICAgICAgICAgICAgZm9yIGZpbGVfbmFtZSBpbiBmaWxlX25hbWVzOgotICAgICAgICAg ICAgICAgIGZpbGVfcGF0aCA9IG9zLnBhdGguam9pbihkaXJfcGF0aCwgZmlsZV9uYW1lKQorICAg ICAgICAgICAgICAgIGZpbGVfcGF0aCA9IHNlbGYuZmlsZXN5c3RlbS5qb2luKGRpcl9wYXRoLCBm aWxlX25hbWUpCiAgICAgICAgICAgICAgICAgc2VsZi5wcm9jZXNzX2ZpbGUoZmlsZV9wYXRoKQog CiAgICAgZGVmIHByb2Nlc3NfcGF0aHMoc2VsZiwgcGF0aHMpOgotICAgICAgICAiIiJQcm9jZXNz IHRoZSBnaXZlbiBmaWxlIGFuZCBkaXJlY3RvcnkgcGF0aHMuCi0KLSAgICAgICAgQXJnczoKLSAg ICAgICAgICBwYXRoczogQSBsaXN0IG9mIGZpbGUgYW5kIGRpcmVjdG9yeSBwYXRocy4KLQotICAg ICAgICAiIiIKICAgICAgICAgZm9yIHBhdGggaW4gcGF0aHM6Ci0gICAgICAgICAgICBpZiBvcy5w YXRoLmlzZGlyKHBhdGgpOgorICAgICAgICAgICAgaWYgc2VsZi5maWxlc3lzdGVtLmlzZGlyKHBh dGgpOgogICAgICAgICAgICAgICAgIHNlbGYuX3Byb2Nlc3NfZGlyZWN0b3J5KGRpcmVjdG9yeT1w YXRoKQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBzZWxmLnByb2Nlc3NfZmls ZShwYXRoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxlcmVh ZGVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxlcmVhZGVy X3VuaXR0ZXN0LnB5CmluZGV4IDYzMjgzMzc2NWU5NmRkMDJjNjVlYzk1MjQ3YThkYjZkYWQ1MzZk MTIuLmE3YjJlZGIzZGFjMGZlZDU1NDlhY2ZmYWRhYjNlMzFkNTIzMDJmN2IgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsZXJlYWRlcl91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2ZpbGVyZWFkZXJfdW5pdHRlc3QucHkKQEAg LTI0LDEyICsyNCw5IEBACiAKIGZyb20gX19mdXR1cmVfXyBpbXBvcnQgd2l0aF9zdGF0ZW1lbnQK IAotaW1wb3J0IGNvZGVjcwotaW1wb3J0IG9zCi1pbXBvcnQgc2h1dGlsCi1pbXBvcnQgdGVtcGZp bGUKIGltcG9ydCB1bml0dGVzdAogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5 c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3Rl c3RpbmcgaW1wb3J0IExvZ2dpbmdUZXN0Q2FzZQogZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vy IGltcG9ydCBQcm9jZXNzb3JCYXNlCiBmcm9tIHdlYmtpdHB5LnN0eWxlLmZpbGVyZWFkZXIgaW1w b3J0IFRleHRGaWxlUmVhZGVyCkBAIC01OCwyNCArNTUsMjEgQEAgY2xhc3MgVGV4dEZpbGVSZWFk ZXJUZXN0KExvZ2dpbmdUZXN0Q2FzZSk6CiAKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAgICAg IExvZ2dpbmdUZXN0Q2FzZS5zZXRVcChzZWxmKQotICAgICAgICBwcm9jZXNzb3IgPSBUZXh0Rmls ZVJlYWRlclRlc3QuTW9ja1Byb2Nlc3NvcigpCi0KLSAgICAgICAgdGVtcF9kaXIgPSB0ZW1wZmls ZS5ta2R0ZW1wKCkKLQotICAgICAgICBzZWxmLl9maWxlX3JlYWRlciA9IFRleHRGaWxlUmVhZGVy KHByb2Nlc3NvcikKLSAgICAgICAgc2VsZi5fcHJvY2Vzc29yID0gcHJvY2Vzc29yCi0gICAgICAg IHNlbGYuX3RlbXBfZGlyID0gdGVtcF9kaXIKKyAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQg YmUgYSBNb2NrRmlsZVN5c3RlbSBvbmNlIFRleHRGaWxlUmVhZGVyIGlzIG1vdmVkIGVudGlyZWx5 IG9uIHRvcCBvZiBGaWxlU3lzdGVtLgorICAgICAgICBzZWxmLmZpbGVzeXN0ZW0gPSBGaWxlU3lz dGVtKCkKKyAgICAgICAgc2VsZi5fdGVtcF9kaXIgPSBzdHIoc2VsZi5maWxlc3lzdGVtLm1rZHRl bXAoKSkKKyAgICAgICAgc2VsZi5fcHJvY2Vzc29yID0gVGV4dEZpbGVSZWFkZXJUZXN0Lk1vY2tQ cm9jZXNzb3IoKQorICAgICAgICBzZWxmLl9maWxlX3JlYWRlciA9IFRleHRGaWxlUmVhZGVyKHNl bGYuZmlsZXN5c3RlbSwgc2VsZi5fcHJvY2Vzc29yKQogCiAgICAgZGVmIHRlYXJEb3duKHNlbGYp OgogICAgICAgICBMb2dnaW5nVGVzdENhc2UudGVhckRvd24oc2VsZikKLSAgICAgICAgc2h1dGls LnJtdHJlZShzZWxmLl90ZW1wX2RpcikKKyAgICAgICAgc2VsZi5maWxlc3lzdGVtLnJtdHJlZShz ZWxmLl90ZW1wX2RpcikKIAotICAgIGRlZiBfY3JlYXRlX2ZpbGUoc2VsZiwgcmVsX3BhdGgsIHRl eHQsIGVuY29kaW5nPSJ1dGYtOCIpOgorICAgIGRlZiBfY3JlYXRlX2ZpbGUoc2VsZiwgcmVsX3Bh dGgsIHRleHQpOgogICAgICAgICAiIiJDcmVhdGUgYSBmaWxlIHdpdGggZ2l2ZW4gdGV4dCBhbmQg cmV0dXJuIHRoZSBwYXRoIHRvIHRoZSBmaWxlLiIiIgotICAgICAgICAjIEZJWE1FOiBUaGVyZSBh cmUgYmV0dGVyL21vcmUgc2VjdXJlIEFQSXMgZm9yIGNyZWF0aW4gdG1wIGZpbGUgcGF0aHMuCi0g ICAgICAgIGZpbGVfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLl90ZW1wX2RpciwgcmVsX3BhdGgp Ci0gICAgICAgIHdpdGggY29kZWNzLm9wZW4oZmlsZV9wYXRoLCAidyIsIGVuY29kaW5nKSBhcyBm aWxlOgotICAgICAgICAgICAgZmlsZS53cml0ZSh0ZXh0KQorICAgICAgICAjIEZJWE1FOiBUaGVy ZSBhcmUgYmV0dGVyL21vcmUgc2VjdXJlIEFQSXMgZm9yIGNyZWF0aW5nIHRtcCBmaWxlIHBhdGhz LgorICAgICAgICBmaWxlX3BhdGggPSBzZWxmLmZpbGVzeXN0ZW0uam9pbihzZWxmLl90ZW1wX2Rp ciwgcmVsX3BhdGgpCisgICAgICAgIHNlbGYuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoZmls ZV9wYXRoLCB0ZXh0KQogICAgICAgICByZXR1cm4gZmlsZV9wYXRoCiAKICAgICBkZWYgX3Bhc3Nl ZF90b19wcm9jZXNzb3Ioc2VsZik6CkBAIC05OCw4ICs5Miw4IEBAIGNsYXNzIFRleHRGaWxlUmVh ZGVyVGVzdChMb2dnaW5nVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydExvZyhbIkVSUk9S OiBGaWxlIGRvZXMgbm90IGV4aXN0OiAnZG9lc19ub3RfZXhpc3QudHh0J1xuIl0pCiAKICAgICBk ZWYgdGVzdF9wcm9jZXNzX2ZpbGVfX2lzX2RpcihzZWxmKToKLSAgICAgICAgdGVtcF9kaXIgPSBv cy5wYXRoLmpvaW4oc2VsZi5fdGVtcF9kaXIsICd0ZXN0X2RpcicpCi0gICAgICAgIG9zLm1rZGly KHRlbXBfZGlyKQorICAgICAgICB0ZW1wX2RpciA9IHNlbGYuZmlsZXN5c3RlbS5qb2luKHNlbGYu X3RlbXBfZGlyLCAndGVzdF9kaXInKQorICAgICAgICBzZWxmLmZpbGVzeXN0ZW0ubWF5YmVfbWFr ZV9kaXJlY3RvcnkodGVtcF9kaXIpCiAKICAgICAgICAgc2VsZi5fZmlsZV9yZWFkZXIucHJvY2Vz c19maWxlKHRlbXBfZGlyKQogCkBAIC0xMTMsOCArMTA3LDcgQEAgY2xhc3MgVGV4dEZpbGVSZWFk ZXJUZXN0KExvZ2dpbmdUZXN0Q2FzZSk6CiAgICAgICAgICMgcmVtYWluLgogICAgICAgICBtZXNz YWdlID0gbG9nX21lc3NhZ2VzLnBvcCgpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG1lc3Nh Z2Uuc3RhcnRzd2l0aCgnV0FSTklORzogQ291bGQgbm90IHJlYWQgZmlsZS4gJwotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJTa2lwcGluZzogJyVzJ1xuICAiICUg dGVtcF9kaXIpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUobWVzc2FnZS5zdGFydHN3aXRoKCJX QVJOSU5HOiBDb3VsZCBub3QgcmVhZCBmaWxlLiBTa2lwcGluZzogJyVzJ1xuICAiICUgdGVtcF9k aXIpKQogCiAgICAgICAgIHNlbGYuX2Fzc2VydF9maWxlX3JlYWRlcihbXSwgMSkKIApAQCAtMTQ3 LDEyICsxNDAsMTIgQEAgY2xhc3MgVGV4dEZpbGVSZWFkZXJUZXN0KExvZ2dpbmdUZXN0Q2FzZSk6 CiAKICAgICBkZWYgdGVzdF9wcm9jZXNzX3BhdGhzKHNlbGYpOgogICAgICAgICAjIFdlIHRlc3Qg YSBsaXN0IG9mIHBhdGhzIHRoYXQgY29udGFpbnMgYm90aCBhIGZpbGUgYW5kIGEgZGlyZWN0b3J5 LgotICAgICAgICBkaXIgPSBvcy5wYXRoLmpvaW4oc2VsZi5fdGVtcF9kaXIsICdmb29fZGlyJykK LSAgICAgICAgb3MubWtkaXIoZGlyKQorICAgICAgICBkaXIgPSBzZWxmLmZpbGVzeXN0ZW0uam9p bihzZWxmLl90ZW1wX2RpciwgJ2Zvb19kaXInKQorICAgICAgICBzZWxmLmZpbGVzeXN0ZW0ubWF5 YmVfbWFrZV9kaXJlY3RvcnkoZGlyKQogCiAgICAgICAgIGZpbGVfcGF0aDEgPSBzZWxmLl9jcmVh dGVfZmlsZSgnZmlsZTEudHh0JywgJ2ZvbycpCiAKLSAgICAgICAgcmVsX3BhdGggPSBvcy5wYXRo LmpvaW4oJ2Zvb19kaXInLCAnZmlsZTIudHh0JykKKyAgICAgICAgcmVsX3BhdGggPSBzZWxmLmZp bGVzeXN0ZW0uam9pbignZm9vX2RpcicsICdmaWxlMi50eHQnKQogICAgICAgICBmaWxlX3BhdGgy ID0gc2VsZi5fY3JlYXRlX2ZpbGUocmVsX3BhdGgsICdiYXInKQogCiAgICAgICAgIHNlbGYuX2Zp bGVfcmVhZGVyLnByb2Nlc3NfcGF0aHMoW2RpciwgZmlsZV9wYXRoMV0pCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL21haW4ucHkKaW5kZXggOGM1MWM2MWMzZTY4MTA1NzdkYTJmNGI2OTAwNzE5ODAy YWMyNzUzNi4uMWViNzg1ZTVlNzkwM2RmYjg2N2I0Zjk2ZDdiOTkyOTkwNGZmZTc4MiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9tYWluLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbi5weQpAQCAtMTkyLDcgKzE5Miw3IEBAIGNsYXNzIENo ZWNrV2ViS2l0U3R5bGUob2JqZWN0KToKICAgICAgICAgcGF0aHMgPSBjaGFuZ2VfZGlyZWN0b3J5 KGhvc3QuZmlsZXN5c3RlbSwgY2hlY2tvdXRfcm9vdD1jaGVja291dF9yb290LCBwYXRocz1wYXRo cykKIAogICAgICAgICBzdHlsZV9wcm9jZXNzb3IgPSBTdHlsZVByb2Nlc3Nvcihjb25maWd1cmF0 aW9uKQotICAgICAgICBmaWxlX3JlYWRlciA9IFRleHRGaWxlUmVhZGVyKHN0eWxlX3Byb2Nlc3Nv cikKKyAgICAgICAgZmlsZV9yZWFkZXIgPSBUZXh0RmlsZVJlYWRlcihob3N0LmZpbGVzeXN0ZW0s IHN0eWxlX3Byb2Nlc3NvcikKIAogICAgICAgICBpZiBwYXRocyBhbmQgbm90IG9wdGlvbnMuZGlm Zl9maWxlczoKICAgICAgICAgICAgIGZpbGVfcmVhZGVyLnByb2Nlc3NfcGF0aHMocGF0aHMpCg==