72677 2011-11-17 16:09:39 -0800 Remove more direct uses of os.path 2022-02-27 23:47:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric eric abarth ojan webkit.review.bot oldest_to_newest 505324 0 eric 2011-11-17 16:09:39 -0800 Remove more direct uses of os.path 505326 1 115705 eric 2011-11-17 16:10:56 -0800 Created attachment 115705 Patch 505332 2 115705 abarth 2011-11-17 16:17:14 -0800 Comment on attachment 115705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115705&action=review > Tools/Scripts/webkitpy/common/config/committervalidator.py:43 > + (path, extension) = os.path.splitext(committers_path) We should call filesystem.splitext. The motivation is to have the tests work the same way on Window and Linux. 505340 3 eric 2011-11-17 16:23:42 -0800 Committed r100697: <http://trac.webkit.org/changeset/100697> 115705 2011-11-17 16:10:56 -0800 2022-02-27 23:47:49 -0800 Patch bug-72677-20111117161054.patch text/plain 9803 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNjk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjIxNDcxNTIwY2M3MDNhMWNhYWMwZThhNTRmN2NiOWQy N2ZjMjlhZC4uZWYyMzAzMzIyZTZjOTI4OTFlNmEwNWMxOTI1YjA4YTEzYjMwYWU4YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDExLTExLTE3ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAorICAgICAg ICBSZW1vdmUgbW9yZSBkaXJlY3QgdXNlcyBvZiBvcy5wYXRoCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjY3NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBtb3JlIHVzZXMgb2Ygb3MucGF0aCwg aW5jbHVkaW5nIHJlZmFjdG9yaW5nCisgICAgICAgIENvbW1pdHRlclZhbGlkYXRvciB0byB1c2Ug YSBIb3N0IG9iamVjdCBpbnN0ZWFkIG9mCisgICAgICAgIG1hbnVhbCBoYWNrcyB0byBlbXVsYXRl IHdoYXQgU0NNIGFuZCBGaWxlU3lzdGVtIHByb3ZpZGUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnZhbGlkYXRvci5weToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVydmFsaWRhdG9yX3VuaXR0ZXN0 LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVt X21vY2sucHk6CisgICAgICAgICAtIFR1cm5zIG91dCBub25lIG9mIG91ciB1bml0dGVzdHMgYWN0 dWFsbHkgbG9va2VkIGF0IHRoaXMgcGF0aC4KKyAgICAgICAgICAgbm93IEkndmUgbWFkZSBpdCBi ZSBhIHZhbGlkIHBhdGguCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9mZWVk ZXJzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMu cHk6CisKKzIwMTEtMTEtMTcgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAgICAg ICAgIFRlYWNoIFRleHRGaWxlUmVhZGVyIGFib3V0IEZpbGVTeXN0ZW0KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNjczCiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZy5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZy5weQppbmRleCA3YzZi NWYyNGVhOTlhYjBlNzQ2OTNlMzIwODhhMTM4NDZkNjQ0YjFmLi4yZjZjMzNiODAzZTcyOGNhYjM5 NjllMGI5ZTUwY2JjMmI0YTk2YzQyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5CkBAIC0zMCw3ICszMCw2IEBACiAKIGltcG9y dCBjb2RlY3MKIGltcG9ydCBmaWxlaW5wdXQgIyBpbnBsYWNlIGZpbGUgZWRpdGluZyBmb3Igc2V0 X3Jldmlld2VyX2luX2NoYW5nZWxvZwotaW1wb3J0IG9zLnBhdGgKIGltcG9ydCByZQogaW1wb3J0 IHRleHR3cmFwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9jb21taXR0ZXJ2YWxpZGF0b3IucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvY29tbWl0dGVydmFsaWRhdG9yLnB5CmluZGV4IGU1NDMzNzNjNzgxZjBlMTFkZWJm ZjI5ZDMwNzllOGQwMTAxNDhlNWIuLjJmNjZjYTY0NzZjZmZmMjdlMDZlNjcyZjI4ZTBkZDA5MWY0 NzU5NjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9j b21taXR0ZXJ2YWxpZGF0b3IucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL2NvbW1pdHRlcnZhbGlkYXRvci5weQpAQCAtMzAsMjggKzMwLDE4IEBACiAKIGltcG9y dCBvcwogCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3NwYXRoIGltcG9ydCByZWxwYXRo CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcgaW1wb3J0IGNvbW1pdHRlcnMsIHVybHMKIAog CiBjbGFzcyBDb21taXR0ZXJWYWxpZGF0b3Iob2JqZWN0KToKLQotICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBidWd6aWxsYSk6Ci0gICAgICAgIHNlbGYuX2J1Z3ppbGxhID0gYnVnemlsbGEKLQotICAg IGRlZiBfY2hlY2tvdXRfcm9vdChzZWxmKToKLSAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBhIGhh Y2ssIHdlIHdvdWxkIGhhdmUgdGhpcyBmcm9tIHNjbS5jaGVja291dF9yb290Ci0gICAgICAgICMg aWYgd2UgaGFkIGFueSB3YXkgdG8gZ2V0IHRvIGFuIHNjbSBvYmplY3QgaGVyZS4KLSAgICAgICAg Y29tcG9uZW50cyA9IF9fZmlsZV9fLnNwbGl0KG9zLnNlcCkKLSAgICAgICAgdG9vbHNfaW5kZXgg PSBjb21wb25lbnRzLmluZGV4KCJUb29scyIpCi0gICAgICAgIHJldHVybiBvcy5zZXAuam9pbihj b21wb25lbnRzWzp0b29sc19pbmRleF0pCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QpOgor ICAgICAgICBzZWxmLmhvc3QgPSBob3N0CiAKICAgICBkZWYgX2NvbW1pdHRlcnNfcHlfcGF0aChz ZWxmKToKICAgICAgICAgIyBleHRlbnNpb24gY2FuIHNvbWV0aW1lcyBiZSAucHljLCB3ZSBhbHdh eXMgd2FudCAucHkKLSAgICAgICAgKHBhdGgsIGV4dGVuc2lvbikgPSBvcy5wYXRoLnNwbGl0ZXh0 KGNvbW1pdHRlcnMuX19maWxlX18pCi0gICAgICAgICMgRklYTUU6IFdoZW4gd2UncmUgYWxsb3dl ZCB0byB1c2UgcHl0aG9uIDIuNiB3ZSBjYW4gdXNlIHRoZSByZWFsCi0gICAgICAgICMgb3MucGF0 aC5yZWxwYXRoCi0gICAgICAgIHBhdGggPSByZWxwYXRoKHBhdGgsIHNlbGYuX2NoZWNrb3V0X3Jv b3QoKSkKKyAgICAgICAgY29tbWl0dGVyc19wYXRoID0gc2VsZi5ob3N0LmZpbGVzeXN0ZW0ucGF0 aF90b19tb2R1bGUoY29tbWl0dGVycy5fX25hbWVfXykKKyAgICAgICAgKHBhdGgsIGV4dGVuc2lv bikgPSBvcy5wYXRoLnNwbGl0ZXh0KGNvbW1pdHRlcnNfcGF0aCkKKyAgICAgICAgcGF0aCA9IHNl bGYuaG9zdC5maWxlc3lzdGVtLnJlbHBhdGgocGF0aCwgc2VsZi5ob3N0LnNjbSgpLmNoZWNrb3V0 X3Jvb3QpCiAgICAgICAgIHJldHVybiAiLiIuam9pbihbcGF0aCwgInB5Il0pCiAKICAgICBkZWYg X2ZsYWdfcGVybWlzc2lvbl9yZWplY3Rpb25fbWVzc2FnZShzZWxmLCBzZXR0ZXJfZW1haWwsIGZs YWdfbmFtZSk6CkBAIC03MiwyMSArNjIsMTYgQEAgY2xhc3MgQ29tbWl0dGVyVmFsaWRhdG9yKG9i amVjdCk6CiAKICAgICBkZWYgX3ZhbGlkYXRlX3NldHRlcl9lbWFpbChzZWxmLCBwYXRjaCwgcmVz dWx0X2tleSwgcmVqZWN0aW9uX2Z1bmN0aW9uKToKICAgICAgICAgY29tbWl0dGVyID0gZ2V0YXR0 cihwYXRjaCwgcmVzdWx0X2tleSkoKQotICAgICAgICAjIElmIHRoZSBmbGFnIGlzIHNldCwgYW5k IHdlIGRvbid0IHJlY29nbml6ZSB0aGUgc2V0dGVyLCByZWplY3QgdGhlCi0gICAgICAgICMgZmxh ZyEKKyAgICAgICAgIyBJZiB0aGUgZmxhZyBpcyBzZXQsIGFuZCB3ZSBkb24ndCByZWNvZ25pemUg dGhlIHNldHRlciwgcmVqZWN0IHRoZSBmbGFnIQogICAgICAgICBzZXR0ZXJfZW1haWwgPSBwYXRj aC5fYXR0YWNobWVudF9kaWN0aW9uYXJ5LmdldCgiJXNfZW1haWwiICUgcmVzdWx0X2tleSkKICAg ICAgICAgaWYgc2V0dGVyX2VtYWlsIGFuZCBub3QgY29tbWl0dGVyOgotICAgICAgICAgICAgcmVq ZWN0aW9uX2Z1bmN0aW9uKHBhdGNoLmlkKCksCi0gICAgICAgICAgICAgICAgc2VsZi5fZmxhZ19w ZXJtaXNzaW9uX3JlamVjdGlvbl9tZXNzYWdlKHNldHRlcl9lbWFpbCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0X2tleSkpCisg ICAgICAgICAgICByZWplY3Rpb25fZnVuY3Rpb24ocGF0Y2guaWQoKSwgc2VsZi5fZmxhZ19wZXJt aXNzaW9uX3JlamVjdGlvbl9tZXNzYWdlKHNldHRlcl9lbWFpbCwgcmVzdWx0X2tleSkpCiAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgIGRlZiBfcmVq ZWN0X3BhdGNoX2lmX2ZsYWdzX2FyZV9pbnZhbGlkKHNlbGYsIHBhdGNoKToKLSAgICAgICAgcmV0 dXJuIChzZWxmLl92YWxpZGF0ZV9zZXR0ZXJfZW1haWwoCi0gICAgICAgICAgICAgICAgcGF0Y2gs ICJyZXZpZXdlciIsIHNlbGYucmVqZWN0X3BhdGNoX2Zyb21fcmV2aWV3X3F1ZXVlKQotICAgICAg ICAgICAgYW5kIHNlbGYuX3ZhbGlkYXRlX3NldHRlcl9lbWFpbCgKLSAgICAgICAgICAgICAgICBw YXRjaCwgImNvbW1pdHRlciIsIHNlbGYucmVqZWN0X3BhdGNoX2Zyb21fY29tbWl0X3F1ZXVlKSkK KyAgICAgICAgcmV0dXJuIChzZWxmLl92YWxpZGF0ZV9zZXR0ZXJfZW1haWwocGF0Y2gsICJyZXZp ZXdlciIsIHNlbGYucmVqZWN0X3BhdGNoX2Zyb21fcmV2aWV3X3F1ZXVlKQorICAgICAgICAgICAg YW5kIHNlbGYuX3ZhbGlkYXRlX3NldHRlcl9lbWFpbChwYXRjaCwgImNvbW1pdHRlciIsIHNlbGYu cmVqZWN0X3BhdGNoX2Zyb21fY29tbWl0X3F1ZXVlKSkKIAogICAgIGRlZiBwYXRjaGVzX2FmdGVy X3JlamVjdGluZ19pbnZhbGlkX2NvbW1pdGVyc19hbmRfcmV2aWV3ZXJzKHNlbGYsIHBhdGNoZXMp OgogICAgICAgICByZXR1cm4gW3BhdGNoIGZvciBwYXRjaCBpbiBwYXRjaGVzIGlmIHNlbGYuX3Jl amVjdF9wYXRjaF9pZl9mbGFnc19hcmVfaW52YWxpZChwYXRjaCldCkBAIC05NSw3ICs4MCw3IEBA IGNsYXNzIENvbW1pdHRlclZhbGlkYXRvcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYXR0YWNobWVudF9pZCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFkZGl0aW9uYWxfY29tbWVudF90ZXh0PU5vbmUpOgogICAgICAgICBj b21tZW50X3RleHQgPSAiUmVqZWN0aW5nIGF0dGFjaG1lbnQgJXMgZnJvbSBjb21taXQtcXVldWUu IiAlIGF0dGFjaG1lbnRfaWQKLSAgICAgICAgc2VsZi5fYnVnemlsbGEuc2V0X2ZsYWdfb25fYXR0 YWNobWVudChhdHRhY2htZW50X2lkLAorICAgICAgICBzZWxmLmhvc3QuYnVncy5zZXRfZmxhZ19v bl9hdHRhY2htZW50KGF0dGFjaG1lbnRfaWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgImNvbW1pdC1xdWV1ZSIsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIi0iLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbW1lbnRfdGV4dCwKQEAgLTEwNSw3ICs5MCw3IEBAIGNsYXNz IENvbW1pdHRlclZhbGlkYXRvcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYXR0YWNobWVudF9pZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGFkZGl0aW9uYWxfY29tbWVudF90ZXh0PU5vbmUpOgogICAgICAgICBjb21tZW50 X3RleHQgPSAiUmVqZWN0aW5nIGF0dGFjaG1lbnQgJXMgZnJvbSByZXZpZXcgcXVldWUuIiAlIGF0 dGFjaG1lbnRfaWQKLSAgICAgICAgc2VsZi5fYnVnemlsbGEuc2V0X2ZsYWdfb25fYXR0YWNobWVu dChhdHRhY2htZW50X2lkLAorICAgICAgICBzZWxmLmhvc3QuYnVncy5zZXRfZmxhZ19vbl9hdHRh Y2htZW50KGF0dGFjaG1lbnRfaWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJ3JldmlldycsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJy0nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1lbnRfdGV4dCwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NvbmZpZy9jb21taXR0ZXJ2YWxpZGF0b3JfdW5pdHRlc3QucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVydmFsaWRhdG9yX3VuaXR0ZXN0LnB5 CmluZGV4IDU4ZmQzYTVjNzZmZDkwYTVmZGIzMTZiMzc1ZGU2Y2IxOGM1ZDBkNTAuLjIzMmYwNzcx ZTA5MzJkZTFkMzU3MTA3ZmY1NTQ1ZDYzOGRmODhhYmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJ2YWxpZGF0b3JfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnZhbGlk YXRvcl91bml0dGVzdC5weQpAQCAtMjgsMTIgKzI4LDEzIEBACiAKIGltcG9ydCB1bml0dGVzdAog Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0CiBmcm9tIC5j b21taXR0ZXJ2YWxpZGF0b3IgaW1wb3J0IENvbW1pdHRlclZhbGlkYXRvcgogCiAKIGNsYXNzIENv bW1pdHRlclZhbGlkYXRvclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X2Zs YWdfcGVybWlzc2lvbl9yZWplY3Rpb25fbWVzc2FnZShzZWxmKToKLSAgICAgICAgdmFsaWRhdG9y ID0gQ29tbWl0dGVyVmFsaWRhdG9yKGJ1Z3ppbGxhPU5vbmUpCisgICAgICAgIHZhbGlkYXRvciA9 IENvbW1pdHRlclZhbGlkYXRvcihNb2NrSG9zdCgpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHZhbGlkYXRvci5fY29tbWl0dGVyc19weV9wYXRoKCksICJUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weSIpCiAgICAgICAgIGV4cGVjdGVkX21lc3NzYWdl ID0gIiIiZm9vQGZvby5jb20gZG9lcyBub3QgaGF2ZSByZXZpZXcgcGVybWlzc2lvbnMgYWNjb3Jk aW5nIHRvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvYnJvd3Nlci90cnVuay9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weS4KIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkKaW5k ZXggZjRlYTRhYjIyMjEzNDUxNjAyZjRiNDQwZTEyODFmMTk0YTc1NjY2NS4uNTdkY2UzZGI3M2I2 ZDMyZGE1YWRkMjFkNzEwMmE5NTU5Yzg1MWFlMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5CkBAIC04Nyw3ICs4 Nyw3IEBAIGNsYXNzIE1vY2tGaWxlU3lzdGVtKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBob21l X2RpcmVjdG9yeSArIHNlbGYuc2VwICsgcGFydHNbMV0KIAogICAgIGRlZiBwYXRoX3RvX21vZHVs ZShzZWxmLCBtb2R1bGVfbmFtZSk6Ci0gICAgICAgIHJldHVybiAiL21vY2stY2hlY2tvdXQvVG9v bHMvU2NyaXB0cy93ZWJraXRweS8lcyIgJSBtb2R1bGVfbmFtZQorICAgICAgICByZXR1cm4gIi9t b2NrLWNoZWNrb3V0L1Rvb2xzL1NjcmlwdHMvIiArIG1vZHVsZV9uYW1lLnJlcGxhY2UoJy4nLCAn LycpICsgIi5weSIKIAogICAgIGRlZiBjaGRpcihzZWxmLCBwYXRoKToKICAgICAgICAgcGF0aCA9 IHNlbGYubm9ybXBhdGgocGF0aCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9ib3QvZmVlZGVycy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZmVl ZGVycy5weQppbmRleCAwYjdmMjNkMjU1NWQwODU5MGM3ZDcwOGRkMmFkODllY2U4NTI2MzFkLi40 YmEyZjA0ODUwYzM2M2VmMDU1YjFjMDNlNTNjN2U4ZDRkZjk1YzJiIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2ZlZWRlcnMucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2JvdC9mZWVkZXJzLnB5CkBAIC00NCw3ICs0NCw3IEBAIGNsYXNzIENv bW1pdFF1ZXVlRmVlZGVyKEFic3RyYWN0RmVlZGVyKToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxm LCB0b29sKToKICAgICAgICAgQWJzdHJhY3RGZWVkZXIuX19pbml0X18oc2VsZiwgdG9vbCkKLSAg ICAgICAgc2VsZi5jb21taXR0ZXJfdmFsaWRhdG9yID0gQ29tbWl0dGVyVmFsaWRhdG9yKHNlbGYu X3Rvb2wuYnVncykKKyAgICAgICAgc2VsZi5jb21taXR0ZXJfdmFsaWRhdG9yID0gQ29tbWl0dGVy VmFsaWRhdG9yKHNlbGYuX3Rvb2wpCiAKICAgICBkZWYgX3VwZGF0ZV93b3JrX2l0ZW1zKHNlbGYs IGl0ZW1faWRzKToKICAgICAgICAgIyBGSVhNRTogVGhpcyBpcyB0aGUgbGFzdCB1c2Ugb2YgdXBk YXRlX3dvcmtfaXRlbXMsIHRoZSBjb21taXQtcXVldWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IGNlMDJkOTJjZGQ5YTZiYTk2ZDk4YTBh Njc5MDJiZjk1MDZhODRmOGIuLmY2MWE2Mzk5MTk5YTc5YzgzZjA4ZWM2ZGY3ZjZmOWM4OWQ4YmU5 NTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1 ZXMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5w eQpAQCAtMjY3LDcgKzI2Nyw3IEBAIGNsYXNzIENvbW1pdFF1ZXVlKEFic3RyYWN0UGF0Y2hRdWV1 ZSwgU3RlcFNlcXVlbmNlRXJyb3JIYW5kbGVyLCBDb21taXRRdWV1ZVRhc2tECiAKICAgICBkZWYg YmVnaW5fd29ya19xdWV1ZShzZWxmKToKICAgICAgICAgQWJzdHJhY3RQYXRjaFF1ZXVlLmJlZ2lu X3dvcmtfcXVldWUoc2VsZikKLSAgICAgICAgc2VsZi5jb21taXR0ZXJfdmFsaWRhdG9yID0gQ29t bWl0dGVyVmFsaWRhdG9yKHNlbGYuX3Rvb2wuYnVncykKKyAgICAgICAgc2VsZi5jb21taXR0ZXJf dmFsaWRhdG9yID0gQ29tbWl0dGVyVmFsaWRhdG9yKHNlbGYuX3Rvb2wpCiAgICAgICAgIHNlbGYu X2V4cGVjdGVkX2ZhaWx1cmVzID0gRXhwZWN0ZWRGYWlsdXJlcygpCiAgICAgICAgIHNlbGYuX2xh eW91dF90ZXN0X3Jlc3VsdHNfcmVhZGVyID0gTGF5b3V0VGVzdFJlc3VsdHNSZWFkZXIoc2VsZi5f dG9vbCwgc2VsZi5fbG9nX2RpcmVjdG9yeSgpKQogCkBAIC0yODgsNyArMjg4LDcgQEAgY2xhc3Mg Q29tbWl0UXVldWUoQWJzdHJhY3RQYXRjaFF1ZXVlLCBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIs IENvbW1pdFF1ZXVlVGFza0QKICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICAg ICAgc2VsZi5fZGlkX3JldHJ5KHBhdGNoKQogICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6 Ci0gICAgICAgICAgICB2YWxpZGF0b3IgPSBDb21taXR0ZXJWYWxpZGF0b3Ioc2VsZi5fdG9vbC5i dWdzKQorICAgICAgICAgICAgdmFsaWRhdG9yID0gQ29tbWl0dGVyVmFsaWRhdG9yKHNlbGYuX3Rv b2wpCiAgICAgICAgICAgICB2YWxpZGF0b3IucmVqZWN0X3BhdGNoX2Zyb21fY29tbWl0X3F1ZXVl KHBhdGNoLmlkKCksIHNlbGYuX2Vycm9yX21lc3NhZ2VfZm9yX2J1Zyh0YXNrLCBwYXRjaCwgZSkp CiAgICAgICAgICAgICByZXN1bHRzX2FyY2hpdmUgPSB0YXNrLnJlc3VsdHNfYXJjaGl2ZV9mcm9t X3BhdGNoX3Rlc3RfcnVuKHBhdGNoKQogICAgICAgICAgICAgaWYgcmVzdWx0c19hcmNoaXZlOgo=