125448 2013-12-09 06:09:45 -0800 Merge mark_for_landing and mark_for_commit_queue into one argument 2013-12-10 02:15:30 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbatyai.u-szeged webkit-unassigned commit-queue glenn rniwa oldest_to_newest 957867 0 dbatyai.u-szeged 2013-12-09 06:09:45 -0800 In common/net/bugzilla/bugzilla.py # FIXME: mark_for_commit_queue and mark_for_landing should be joined into a single commit_flag argument. # FIXME: Use enum instead of two booleans Since mark_for_landing implies mark_for_commit_queue, these two can be merged into one enum argument. 957870 1 218754 dbatyai.u-szeged 2013-12-09 06:15:39 -0800 Created attachment 218754 Proposed patch 957961 2 218754 rniwa 2013-12-09 10:29:43 -0800 Comment on attachment 218754 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=218754&action=review > Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py:568 > Why don't we add else and return '+' there instead? > Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py:-567 > - if mark_for_commit_queue: And replace this with != mark_for_nothing. 958235 3 218841 dbatyai.u-szeged 2013-12-10 01:23:02 -0800 Created attachment 218841 Proposed patch 958253 4 218841 commit-queue 2013-12-10 02:15:28 -0800 Comment on attachment 218841 Proposed patch Clearing flags on attachment: 218841 Committed r160353: <http://trac.webkit.org/changeset/160353> 958254 5 commit-queue 2013-12-10 02:15:30 -0800 All reviewed patches have been landed. Closing bug. 218754 2013-12-09 06:15:39 -0800 2013-12-10 01:22:33 -0800 Proposed patch proposedpatch.patch text/plain 11052 dbatyai.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NzRl OTkyLi40YWY1NjFlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMTItMDkgIETDoW5pZWwgQsOhdHlhaSAgPEJh dHlhaS5EYW5pZWxAc3R1ZC51LXN6ZWdlZC5odT4KKworICAgICAgICBNZXJnZSBtYXJrX2Zvcl9s YW5kaW5nIGFuZCBtYXJrX2Zvcl9jb21taXRfcXVldWUgaW50byBvbmUgYXJndW1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTQ0OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5OgorICAgICAgICAoQ29tbWl0UXVl dWVGbGFnKToKKyAgICAgICAgKEJ1Z3ppbGxhLl9jb21taXRfcXVldWVfZmxhZyk6CisgICAgICAg IChCdWd6aWxsYS5fZmlsbF9hdHRhY2htZW50X2Zvcm0pOgorICAgICAgICAoQnVnemlsbGEuYWRk X3BhdGNoX3RvX2J1Zyk6CisgICAgICAgIChCdWd6aWxsYS5jcmVhdGVfYnVnKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfdW5pdHRlc3Qu cHk6CisgICAgICAgICh0ZXN0X2NvbW1pdF9xdWV1ZV9mbGFnLmFzc2VydF9jb21taXRfcXVldWVf ZmxhZyk6CisgICAgICAgICh0ZXN0X2NvbW1pdF9xdWV1ZV9mbGFnKToKKwogMjAxMy0xMi0wOCAg U2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIDMyLWJpdCBNaW5pQnJvd3Nl ciBkb2Vzbid0IGJ1aWxkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXggNzEwMjc5ZC4uYWViM2ZjZSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxh LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6 aWxsYS5weQpAQCAtMjkzLDYgKzI5MywxMiBAQCBjbGFzcyBCdWd6aWxsYVF1ZXJpZXMob2JqZWN0 KToKICAgICAgICAgcmV0dXJuIG1hcChsYW1iZGEgcGFpcjogcGFpclswXSwgcGFpcnMpCiAKIAor Y2xhc3MgQ29tbWl0UXVldWVGbGFnKG9iamVjdCk6CisgICAgbWFya19mb3Jfbm90aGluZyA9IDAK KyAgICBtYXJrX2Zvcl9jb21taXRfcXVldWUgPSAxCisgICAgbWFya19mb3JfbGFuZGluZyA9IDIK KworCiBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb21t aXR0ZXJzPWNvbW1pdHRlcnMuQ29tbWl0dGVyTGlzdCgpKToKICAgICAgICAgc2VsZi5hdXRoZW50 aWNhdGVkID0gRmFsc2UKQEAgLTU1MCwzMSArNTU2LDI3IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVj dCk6CiAgICAgICAgICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGVkID0gVHJ1ZQogICAgICAgICAg ICAgICAgIHNlbGYudXNlcm5hbWUgPSB1c2VybmFtZQogCi0gICAgIyBGSVhNRTogVXNlIGVudW0g aW5zdGVhZCBvZiB0d28gYm9vbGVhbnMKLSAgICBkZWYgX2NvbW1pdF9xdWV1ZV9mbGFnKHNlbGYs IG1hcmtfZm9yX2xhbmRpbmcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZSk6Ci0gICAgICAgIGlmIG1h cmtfZm9yX2xhbmRpbmc6CisgICAgZGVmIF9jb21taXRfcXVldWVfZmxhZyhzZWxmLCBjb21taXRf ZmxhZyk6CisgICAgICAgIGlmIGNvbW1pdF9mbGFnID09IENvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zv cl9sYW5kaW5nOgogICAgICAgICAgICAgdXNlciA9IHNlbGYuY29tbWl0dGVycy5jb250cmlidXRv cl9ieV9lbWFpbChzZWxmLnVzZXJuYW1lKQotICAgICAgICAgICAgbWFya19mb3JfY29tbWl0X3F1 ZXVlID0gVHJ1ZQogICAgICAgICAgICAgaWYgbm90IHVzZXI6CiAgICAgICAgICAgICAgICAgX2xv Zy53YXJuaW5nKCJZb3VyIEJ1Z3ppbGxhIGxvZ2luIGlzIG5vdCBsaXN0ZWQgaW4gY29udHJpYnV0 b3JzLmpzb24uIFVwbG9hZGluZyB3aXRoIGNxPyBpbnN0ZWFkIG9mIGNxKyIpCi0gICAgICAgICAg ICAgICAgbWFya19mb3JfbGFuZGluZyA9IEZhbHNlCisgICAgICAgICAgICAgICAgY29tbWl0X2Zs YWcgPSBDb21taXRRdWV1ZUZsYWcubWFya19mb3JfY29tbWl0X3F1ZXVlCiAgICAgICAgICAgICBl bGlmIG5vdCB1c2VyLmNhbl9jb21taXQ6CiAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCJZ b3UncmUgbm90IGEgY29tbWl0dGVyIHlldCBvciBoYXZlbid0IHVwZGF0ZWQgY29udHJpYnV0b3Jz Lmpzb24geWV0LiBVcGxvYWRpbmcgd2l0aCBjcT8gaW5zdGVhZCBvZiBjcSsiKQotICAgICAgICAg ICAgICAgIG1hcmtfZm9yX2xhbmRpbmcgPSBGYWxzZQorICAgICAgICAgICAgICAgIGNvbW1pdF9m bGFnID0gQ29tbWl0UXVldWVGbGFnLm1hcmtfZm9yX2NvbW1pdF9xdWV1ZQogCi0gICAgICAgIGlm IG1hcmtfZm9yX2xhbmRpbmc6CisgICAgICAgIGlmIGNvbW1pdF9mbGFnID09IENvbW1pdFF1ZXVl RmxhZy5tYXJrX2Zvcl9sYW5kaW5nOgogICAgICAgICAgICAgcmV0dXJuICcrJwotICAgICAgICBp ZiBtYXJrX2Zvcl9jb21taXRfcXVldWU6CisgICAgICAgIGlmIGNvbW1pdF9mbGFnID09IENvbW1p dFF1ZXVlRmxhZy5tYXJrX2Zvcl9jb21taXRfcXVldWU6CiAgICAgICAgICAgICByZXR1cm4gJz8n CiAgICAgICAgIHJldHVybiAnWCcKIAotICAgICMgRklYTUU6IG1hcmtfZm9yX2NvbW1pdF9xdWV1 ZSBhbmQgbWFya19mb3JfbGFuZGluZyBzaG91bGQgYmUgam9pbmVkIGludG8gYSBzaW5nbGUgY29t bWl0X2ZsYWcgYXJndW1lbnQuCiAgICAgZGVmIF9maWxsX2F0dGFjaG1lbnRfZm9ybShzZWxmLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVzY3JpcHRpb24sCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBmaWxlX29iamVjdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1hcmtfZm9yX3Jldmlldz1GYWxzZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1hcmtfZm9yX2xhbmRpbmc9RmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb21taXRfZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19mb3Jfbm90aGluZywKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGlzX3BhdGNoPUZhbHNlLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZmlsZW5hbWU9Tm9uZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1pbWV0eXBlPU5vbmUpOgpAQCAtNTgzLDcgKzU4NSw3IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVj dCk6CiAgICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ2lzcGF0Y2gnXSA9ICgiMSIsKQogICAgICAg ICAjIEZJWE1FOiBTaG91bGQgdGhpcyB1c2Ugc2VsZi5fZmluZF9zZWxlY3RfZWxlbWVudF9mb3Jf ZmxhZz8KICAgICAgICAgc2VsZi5icm93c2VyWydmbGFnX3R5cGUtMSddID0gKCc/JywpIGlmIG1h cmtfZm9yX3JldmlldyBlbHNlICgnWCcsKQotICAgICAgICBzZWxmLmJyb3dzZXJbJ2ZsYWdfdHlw ZS0zJ10gPSAoc2VsZi5fY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZywgbWFya19m b3JfY29tbWl0X3F1ZXVlKSwpCisgICAgICAgIHNlbGYuYnJvd3NlclsnZmxhZ190eXBlLTMnXSA9 IChzZWxmLl9jb21taXRfcXVldWVfZmxhZyhjb21taXRfZmxhZyksKQogCiAgICAgICAgIGZpbGVu YW1lID0gZmlsZW5hbWUgb3IgIiVzLnBhdGNoIiAlIHRpbWVzdGFtcCgpCiAgICAgICAgIGlmIG5v dCBtaW1ldHlwZToKQEAgLTYzNywxMSArNjM5LDE2IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6 CiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9ybShuYW1lPSJlbnRyeWZvcm0iKQogICAg ICAgICBmaWxlX29iamVjdCA9IHNlbGYuX2ZpbGVfb2JqZWN0X2Zvcl91cGxvYWQoZmlsZV9vcl9z dHJpbmcpCiAgICAgICAgIGZpbGVuYW1lID0gc2VsZi5fZmlsZW5hbWVfZm9yX3VwbG9hZChmaWxl X29iamVjdCwgYnVnX2lkLCBleHRlbnNpb249InBhdGNoIikKKyAgICAgICAgY29tbWl0X2ZsYWcg PSBDb21taXRRdWV1ZUZsYWcubWFya19mb3Jfbm90aGluZworICAgICAgICBpZiBtYXJrX2Zvcl9s YW5kaW5nOgorICAgICAgICAgICAgY29tbWl0X2ZsYWcgPSBDb21taXRRdWV1ZUZsYWcubWFya19m b3JfbGFuZGluZworICAgICAgICBlbGlmIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZToKKyAgICAgICAg ICAgIGNvbW1pdF9mbGFnID0gQ29tbWl0UXVldWVGbGFnLm1hcmtfZm9yX2NvbW1pdF9xdWV1ZQor CiAgICAgICAgIHNlbGYuX2ZpbGxfYXR0YWNobWVudF9mb3JtKGRlc2NyaXB0aW9uLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlX29iamVjdCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbWFya19mb3JfcmV2aWV3PW1hcmtfZm9yX3JldmlldywKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFya19mb3JfY29tbWl0X3F1ZXVlPW1h cmtfZm9yX2NvbW1pdF9xdWV1ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bWFya19mb3JfbGFuZGluZz1tYXJrX2Zvcl9sYW5kaW5nLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb21taXRfZmxhZz1jb21taXRfZmxhZywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaXNfcGF0Y2g9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZmlsZW5hbWU9ZmlsZW5hbWUpCiAgICAgICAgIGlmIGNvbW1lbnRfdGV4dDoK QEAgLTcwOCwxMSArNzE1LDE1IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgICAgICAg ICAjIFBhdGNoIGZpbGVzIGFyZSBhbHJlYWR5IGJpbmFyeSwgc28gbm8gZW5jb2RpbmcgbmVlZGVk LgogICAgICAgICAgICAgYXNzZXJ0KGlzaW5zdGFuY2UoZGlmZiwgc3RyKSkKICAgICAgICAgICAg IHBhdGNoX2ZpbGVfb2JqZWN0ID0gU3RyaW5nSU8uU3RyaW5nSU8oZGlmZikKKyAgICAgICAgICAg IGNvbW1pdF9mbGFnID0gQ29tbWl0UXVldWVGbGFnLm1hcmtfZm9yX25vdGhpbmcKKyAgICAgICAg ICAgIGlmIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZToKKyAgICAgICAgICAgICAgICBjb21taXRfZmxh ZyA9IENvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9jb21taXRfcXVldWUKKwogICAgICAgICAgICAg c2VsZi5fZmlsbF9hdHRhY2htZW50X2Zvcm0oCiAgICAgICAgICAgICAgICAgICAgIHBhdGNoX2Rl c2NyaXB0aW9uLAogICAgICAgICAgICAgICAgICAgICBwYXRjaF9maWxlX29iamVjdCwKICAgICAg ICAgICAgICAgICAgICAgbWFya19mb3JfcmV2aWV3PW1hcmtfZm9yX3JldmlldywKLSAgICAgICAg ICAgICAgICAgICAgbWFya19mb3JfY29tbWl0X3F1ZXVlPW1hcmtfZm9yX2NvbW1pdF9xdWV1ZSwK KyAgICAgICAgICAgICAgICAgICAgY29tbWl0X2ZsYWc9Y29tbWl0X2ZsYWcsCiAgICAgICAgICAg ICAgICAgICAgIGlzX3BhdGNoPVRydWUpCiAKICAgICAgICAgcmVzcG9uc2UgPSBzZWxmLmJyb3dz ZXIuc3VibWl0KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9idWd6aWxsYS9idWd6aWxsYV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYV91bml0dGVzdC5weQppbmRleCA0ODE3YmQ2Li5j ZDBiNDE5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVn emlsbGEvYnVnemlsbGFfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX3VuaXR0ZXN0LnB5CkBAIC0zMCw3ICszMCw3IEBA IGltcG9ydCB1bml0dGVzdDIgYXMgdW5pdHRlc3QKIGltcG9ydCBkYXRldGltZQogaW1wb3J0IFN0 cmluZ0lPCiAKLWZyb20gLmJ1Z3ppbGxhIGltcG9ydCBCdWd6aWxsYSwgQnVnemlsbGFRdWVyaWVz LCBFZGl0VXNlcnNQYXJzZXIKK2Zyb20gLmJ1Z3ppbGxhIGltcG9ydCBCdWd6aWxsYSwgQnVnemls bGFRdWVyaWVzLCBDb21taXRRdWV1ZUZsYWcsIEVkaXRVc2Vyc1BhcnNlcgogCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5jb25maWcgaW1wb3J0IHVybHMKIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZp Zy5jb21taXR0ZXJzIGltcG9ydCBSZXZpZXdlciwgQ29tbWl0dGVyLCBDb250cmlidXRvciwgQ29t bWl0dGVyTGlzdApAQCAtMzA3LDM0ICszMDcsMzAgQEAgSWdub3JlIHRoaXMgYnVnLiAgSnVzdCBm b3IgdGVzdGluZyBmYWlsdXJlIG1vZGVzIG9mIHdlYmtpdC1wYXRjaCBhbmQgdGhlIGNvbW1pdC0K ICAgICAgICAgICAgIGNvbW1pdHRlcnM9W0NvbW1pdHRlcigiV2ViS2l0IENvbW1pdHRlciIsICJj b21taXR0ZXJAd2Via2l0Lm9yZyIpXSwKICAgICAgICAgICAgIGNvbnRyaWJ1dG9ycz1bQ29udHJp YnV0b3IoIldlYktpdCBDb250cmlidXRvciIsICJjb250cmlidXRvckB3ZWJraXQub3JnIildKQog Ci0gICAgICAgIGRlZiBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZywg bWFya19mb3JfY29tbWl0X3F1ZXVlLCBleHBlY3RlZCwgdXNlcm5hbWU9Tm9uZSk6CisgICAgICAg IGRlZiBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcoY29tbWl0X2ZsYWcsIGV4cGVjdGVkLCB1c2Vy bmFtZT1Ob25lKToKICAgICAgICAgICAgIGJ1Z3ppbGxhLnVzZXJuYW1lID0gdXNlcm5hbWUKICAg ICAgICAgICAgIGNhcHR1cmUgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgICAgIGNhcHR1cmUu Y2FwdHVyZV9vdXRwdXQoKQogICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoYnVnemlsbGEuX2NvbW1pdF9xdWV1ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9 bWFya19mb3JfbGFuZGluZywgbWFya19mb3JfY29tbWl0X3F1ZXVlPW1hcmtfZm9yX2NvbW1pdF9x dWV1ZSksIGV4cGVjdGVkKQorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVnemls bGEuX2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnKSwgZXhwZWN0ZWQpCiAgICAgICAgICAg ICBmaW5hbGx5OgogICAgICAgICAgICAgICAgIGNhcHR1cmUucmVzdG9yZV9vdXRwdXQoKQogCi0g ICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5nPUZhbHNlLCBt YXJrX2Zvcl9jb21taXRfcXVldWU9RmFsc2UsIGV4cGVjdGVkPSdYJywgdXNlcm5hbWU9J3Vua25v d25Ad2Via2l0Lm9yZycpCi0gICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zv cl9sYW5kaW5nPUZhbHNlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9VHJ1ZSwgZXhwZWN0ZWQ9Jz8n LCB1c2VybmFtZT0ndW5rbm93bkB3ZWJraXQub3JnJykKLSAgICAgICAgYXNzZXJ0X2NvbW1pdF9x dWV1ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9RmFsc2UsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1U cnVlLCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSd1bmtub3duQHdlYmtpdC5vcmcnKQotICAgICAg ICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZz1UcnVlLCBtYXJrX2Zv cl9jb21taXRfcXVldWU9VHJ1ZSwgZXhwZWN0ZWQ9Jz8nLCB1c2VybmFtZT0ndW5rbm93bkB3ZWJr aXQub3JnJykKLQotICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFu ZGluZz1GYWxzZSwgbWFya19mb3JfY29tbWl0X3F1ZXVlPUZhbHNlLCBleHBlY3RlZD0nWCcsIHVz ZXJuYW1lPSdjb250cmlidXRvckB3ZWJraXQub3JnJykKLSAgICAgICAgYXNzZXJ0X2NvbW1pdF9x dWV1ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9RmFsc2UsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1U cnVlLCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSdjb250cmlidXRvckB3ZWJraXQub3JnJykKLSAg ICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9VHJ1ZSwgbWFy a19mb3JfY29tbWl0X3F1ZXVlPUZhbHNlLCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSdjb250cmli dXRvckB3ZWJraXQub3JnJykKLSAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKG1hcmtf Zm9yX2xhbmRpbmc9VHJ1ZSwgbWFya19mb3JfY29tbWl0X3F1ZXVlPVRydWUsIGV4cGVjdGVkPSc/ JywgdXNlcm5hbWU9J2NvbnRyaWJ1dG9yQHdlYmtpdC5vcmcnKQotCi0gICAgICAgIGFzc2VydF9j b21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5nPUZhbHNlLCBtYXJrX2Zvcl9jb21taXRf cXVldWU9RmFsc2UsIGV4cGVjdGVkPSdYJywgdXNlcm5hbWU9J2NvbW1pdHRlckB3ZWJraXQub3Jn JykKLSAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9RmFs c2UsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1UcnVlLCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSdj b21taXR0ZXJAd2Via2l0Lm9yZycpCi0gICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyht YXJrX2Zvcl9sYW5kaW5nPVRydWUsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwgZXhwZWN0 ZWQ9JysnLCB1c2VybmFtZT0nY29tbWl0dGVyQHdlYmtpdC5vcmcnKQotICAgICAgICBhc3NlcnRf Y29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZz1UcnVlLCBtYXJrX2Zvcl9jb21taXRf cXVldWU9VHJ1ZSwgZXhwZWN0ZWQ9JysnLCB1c2VybmFtZT0nY29tbWl0dGVyQHdlYmtpdC5vcmcn KQotCi0gICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5nPUZh bHNlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9RmFsc2UsIGV4cGVjdGVkPSdYJywgdXNlcm5hbWU9 J3Jldmlld2VyQHdlYmtpdC5vcmcnKQotICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWco bWFya19mb3JfbGFuZGluZz1GYWxzZSwgbWFya19mb3JfY29tbWl0X3F1ZXVlPVRydWUsIGV4cGVj dGVkPSc/JywgdXNlcm5hbWU9J3Jldmlld2VyQHdlYmtpdC5vcmcnKQotICAgICAgICBhc3NlcnRf Y29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZz1UcnVlLCBtYXJrX2Zvcl9jb21taXRf cXVldWU9RmFsc2UsIGV4cGVjdGVkPScrJywgdXNlcm5hbWU9J3Jldmlld2VyQHdlYmtpdC5vcmcn KQotICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZz1UcnVl LCBtYXJrX2Zvcl9jb21taXRfcXVldWU9VHJ1ZSwgZXhwZWN0ZWQ9JysnLCB1c2VybmFtZT0ncmV2 aWV3ZXJAd2Via2l0Lm9yZycpCisgICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhjb21t aXRfZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19mb3Jfbm90aGluZywgZXhwZWN0ZWQ9J1gnLCB1 c2VybmFtZT0ndW5rbm93bkB3ZWJraXQub3JnJykKKyAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1 ZV9mbGFnKGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9jb21taXRfcXVldWUs IGV4cGVjdGVkPSc/JywgdXNlcm5hbWU9J3Vua25vd25Ad2Via2l0Lm9yZycpCisgICAgICAgIGFz c2VydF9jb21taXRfcXVldWVfZmxhZyhjb21taXRfZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19m b3JfbGFuZGluZywgZXhwZWN0ZWQ9Jz8nLCB1c2VybmFtZT0ndW5rbm93bkB3ZWJraXQub3JnJykK KworICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcoY29tbWl0X2ZsYWc9Q29tbWl0UXVl dWVGbGFnLm1hcmtfZm9yX25vdGhpbmcsIGV4cGVjdGVkPSdYJywgdXNlcm5hbWU9J2NvbnRyaWJ1 dG9yQHdlYmtpdC5vcmcnKQorICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcoY29tbWl0 X2ZsYWc9Q29tbWl0UXVldWVGbGFnLm1hcmtfZm9yX2NvbW1pdF9xdWV1ZSwgZXhwZWN0ZWQ9Jz8n LCB1c2VybmFtZT0nY29udHJpYnV0b3JAd2Via2l0Lm9yZycpCisgICAgICAgIGFzc2VydF9jb21t aXRfcXVldWVfZmxhZyhjb21taXRfZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19mb3JfbGFuZGlu ZywgZXhwZWN0ZWQ9Jz8nLCB1c2VybmFtZT0nY29udHJpYnV0b3JAd2Via2l0Lm9yZycpCisKKyAg ICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVlRmxh Zy5tYXJrX2Zvcl9ub3RoaW5nLCBleHBlY3RlZD0nWCcsIHVzZXJuYW1lPSdjb21taXR0ZXJAd2Vi a2l0Lm9yZycpCisgICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhjb21taXRfZmxhZz1D b21taXRRdWV1ZUZsYWcubWFya19mb3JfY29tbWl0X3F1ZXVlLCBleHBlY3RlZD0nPycsIHVzZXJu YW1lPSdjb21taXR0ZXJAd2Via2l0Lm9yZycpCisgICAgICAgIGFzc2VydF9jb21taXRfcXVldWVf ZmxhZyhjb21taXRfZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19mb3JfbGFuZGluZywgZXhwZWN0 ZWQ9JysnLCB1c2VybmFtZT0nY29tbWl0dGVyQHdlYmtpdC5vcmcnKQorCisgICAgICAgIGFzc2Vy dF9jb21taXRfcXVldWVfZmxhZyhjb21taXRfZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19mb3Jf bm90aGluZywgZXhwZWN0ZWQ9J1gnLCB1c2VybmFtZT0ncmV2aWV3ZXJAd2Via2l0Lm9yZycpCisg ICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhjb21taXRfZmxhZz1Db21taXRRdWV1ZUZs YWcubWFya19mb3JfY29tbWl0X3F1ZXVlLCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSdyZXZpZXdl ckB3ZWJraXQub3JnJykKKyAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9m bGFnPUNvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9sYW5kaW5nLCBleHBlY3RlZD0nKycsIHVzZXJu YW1lPSdyZXZpZXdlckB3ZWJraXQub3JnJykKIAogICAgIGRlZiB0ZXN0X19jaGVja19jcmVhdGVf YnVnX3Jlc3BvbnNlKHNlbGYpOgogICAgICAgICBidWd6aWxsYSA9IEJ1Z3ppbGxhKCkK 218841 2013-12-10 01:23:02 -0800 2013-12-10 02:15:28 -0800 Proposed patch proposedpatch.patch text/plain 10895 dbatyai.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NzRl OTkyLi5mYzJhZDdjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMTItMTAgIETDoW5pZWwgQsOhdHlhaSAgPEJh dHlhaS5EYW5pZWxAc3R1ZC51LXN6ZWdlZC5odT4KKworICAgICAgICBNZXJnZSBtYXJrX2Zvcl9s YW5kaW5nIGFuZCBtYXJrX2Zvcl9jb21taXRfcXVldWUgaW50byBvbmUgYXJndW1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTQ0OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5OgorICAgICAgICAoQ29tbWl0UXVl dWVGbGFnKToKKyAgICAgICAgKEJ1Z3ppbGxhLl9jb21taXRfcXVldWVfZmxhZyk6CisgICAgICAg IChCdWd6aWxsYS5fZmlsbF9hdHRhY2htZW50X2Zvcm0pOgorICAgICAgICAoQnVnemlsbGEuYWRk X3BhdGNoX3RvX2J1Zyk6CisgICAgICAgIChCdWd6aWxsYS5jcmVhdGVfYnVnKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfdW5pdHRlc3Qu cHk6CisgICAgICAgICh0ZXN0X2NvbW1pdF9xdWV1ZV9mbGFnLmFzc2VydF9jb21taXRfcXVldWVf ZmxhZyk6CisgICAgICAgICh0ZXN0X2NvbW1pdF9xdWV1ZV9mbGFnKToKKwogMjAxMy0xMi0wOCAg U2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIDMyLWJpdCBNaW5pQnJvd3Nl ciBkb2Vzbid0IGJ1aWxkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXggNzEwMjc5ZC4uOTQyMjY0NyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxh LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6 aWxsYS5weQpAQCAtMjkzLDYgKzI5MywxMiBAQCBjbGFzcyBCdWd6aWxsYVF1ZXJpZXMob2JqZWN0 KToKICAgICAgICAgcmV0dXJuIG1hcChsYW1iZGEgcGFpcjogcGFpclswXSwgcGFpcnMpCiAKIAor Y2xhc3MgQ29tbWl0UXVldWVGbGFnKG9iamVjdCk6CisgICAgbWFya19mb3Jfbm90aGluZyA9IDAK KyAgICBtYXJrX2Zvcl9jb21taXRfcXVldWUgPSAxCisgICAgbWFya19mb3JfbGFuZGluZyA9IDIK KworCiBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb21t aXR0ZXJzPWNvbW1pdHRlcnMuQ29tbWl0dGVyTGlzdCgpKToKICAgICAgICAgc2VsZi5hdXRoZW50 aWNhdGVkID0gRmFsc2UKQEAgLTU1MCwzMSArNTU2LDI1IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVj dCk6CiAgICAgICAgICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGVkID0gVHJ1ZQogICAgICAgICAg ICAgICAgIHNlbGYudXNlcm5hbWUgPSB1c2VybmFtZQogCi0gICAgIyBGSVhNRTogVXNlIGVudW0g aW5zdGVhZCBvZiB0d28gYm9vbGVhbnMKLSAgICBkZWYgX2NvbW1pdF9xdWV1ZV9mbGFnKHNlbGYs IG1hcmtfZm9yX2xhbmRpbmcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZSk6Ci0gICAgICAgIGlmIG1h cmtfZm9yX2xhbmRpbmc6CisgICAgZGVmIF9jb21taXRfcXVldWVfZmxhZyhzZWxmLCBjb21taXRf ZmxhZyk6CisgICAgICAgIGlmIGNvbW1pdF9mbGFnID09IENvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zv cl9sYW5kaW5nOgogICAgICAgICAgICAgdXNlciA9IHNlbGYuY29tbWl0dGVycy5jb250cmlidXRv cl9ieV9lbWFpbChzZWxmLnVzZXJuYW1lKQotICAgICAgICAgICAgbWFya19mb3JfY29tbWl0X3F1 ZXVlID0gVHJ1ZQogICAgICAgICAgICAgaWYgbm90IHVzZXI6CiAgICAgICAgICAgICAgICAgX2xv Zy53YXJuaW5nKCJZb3VyIEJ1Z3ppbGxhIGxvZ2luIGlzIG5vdCBsaXN0ZWQgaW4gY29udHJpYnV0 b3JzLmpzb24uIFVwbG9hZGluZyB3aXRoIGNxPyBpbnN0ZWFkIG9mIGNxKyIpCi0gICAgICAgICAg ICAgICAgbWFya19mb3JfbGFuZGluZyA9IEZhbHNlCiAgICAgICAgICAgICBlbGlmIG5vdCB1c2Vy LmNhbl9jb21taXQ6CiAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCJZb3UncmUgbm90IGEg Y29tbWl0dGVyIHlldCBvciBoYXZlbid0IHVwZGF0ZWQgY29udHJpYnV0b3JzLmpzb24geWV0LiBV cGxvYWRpbmcgd2l0aCBjcT8gaW5zdGVhZCBvZiBjcSsiKQotICAgICAgICAgICAgICAgIG1hcmtf Zm9yX2xhbmRpbmcgPSBGYWxzZQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBy ZXR1cm4gJysnCiAKLSAgICAgICAgaWYgbWFya19mb3JfbGFuZGluZzoKLSAgICAgICAgICAgIHJl dHVybiAnKycKLSAgICAgICAgaWYgbWFya19mb3JfY29tbWl0X3F1ZXVlOgorICAgICAgICBpZiBj b21taXRfZmxhZyAhPSBDb21taXRRdWV1ZUZsYWcubWFya19mb3Jfbm90aGluZzoKICAgICAgICAg ICAgIHJldHVybiAnPycKICAgICAgICAgcmV0dXJuICdYJwogCi0gICAgIyBGSVhNRTogbWFya19m b3JfY29tbWl0X3F1ZXVlIGFuZCBtYXJrX2Zvcl9sYW5kaW5nIHNob3VsZCBiZSBqb2luZWQgaW50 byBhIHNpbmdsZSBjb21taXRfZmxhZyBhcmd1bWVudC4KICAgICBkZWYgX2ZpbGxfYXR0YWNobWVu dF9mb3JtKHNlbGYsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGVfb2JqZWN0LAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWFya19mb3JfcmV2aWV3PUZhbHNlLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbWFya19mb3JfY29tbWl0X3F1ZXVlPUZhbHNlLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWFya19mb3JfbGFuZGluZz1GYWxzZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9ub3Ro aW5nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaXNfcGF0Y2g9RmFsc2UsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlbmFtZT1Ob25lLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbWltZXR5cGU9Tm9uZSk6CkBAIC01ODMsNyArNTgzLDcgQEAgY2xhc3Mg QnVnemlsbGEob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuYnJvd3NlclsnaXNwYXRjaCddID0g KCIxIiwpCiAgICAgICAgICMgRklYTUU6IFNob3VsZCB0aGlzIHVzZSBzZWxmLl9maW5kX3NlbGVj dF9lbGVtZW50X2Zvcl9mbGFnPwogICAgICAgICBzZWxmLmJyb3dzZXJbJ2ZsYWdfdHlwZS0xJ10g PSAoJz8nLCkgaWYgbWFya19mb3JfcmV2aWV3IGVsc2UgKCdYJywpCi0gICAgICAgIHNlbGYuYnJv d3NlclsnZmxhZ190eXBlLTMnXSA9IChzZWxmLl9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9s YW5kaW5nLCBtYXJrX2Zvcl9jb21taXRfcXVldWUpLCkKKyAgICAgICAgc2VsZi5icm93c2VyWydm bGFnX3R5cGUtMyddID0gKHNlbGYuX2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnKSwpCiAK ICAgICAgICAgZmlsZW5hbWUgPSBmaWxlbmFtZSBvciAiJXMucGF0Y2giICUgdGltZXN0YW1wKCkK ICAgICAgICAgaWYgbm90IG1pbWV0eXBlOgpAQCAtNjM3LDExICs2MzcsMTYgQEAgY2xhc3MgQnVn emlsbGEob2JqZWN0KToKICAgICAgICAgc2VsZi5icm93c2VyLnNlbGVjdF9mb3JtKG5hbWU9ImVu dHJ5Zm9ybSIpCiAgICAgICAgIGZpbGVfb2JqZWN0ID0gc2VsZi5fZmlsZV9vYmplY3RfZm9yX3Vw bG9hZChmaWxlX29yX3N0cmluZykKICAgICAgICAgZmlsZW5hbWUgPSBzZWxmLl9maWxlbmFtZV9m b3JfdXBsb2FkKGZpbGVfb2JqZWN0LCBidWdfaWQsIGV4dGVuc2lvbj0icGF0Y2giKQorICAgICAg ICBjb21taXRfZmxhZyA9IENvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9ub3RoaW5nCisgICAgICAg IGlmIG1hcmtfZm9yX2xhbmRpbmc6CisgICAgICAgICAgICBjb21taXRfZmxhZyA9IENvbW1pdFF1 ZXVlRmxhZy5tYXJrX2Zvcl9sYW5kaW5nCisgICAgICAgIGVsaWYgbWFya19mb3JfY29tbWl0X3F1 ZXVlOgorICAgICAgICAgICAgY29tbWl0X2ZsYWcgPSBDb21taXRRdWV1ZUZsYWcubWFya19mb3Jf Y29tbWl0X3F1ZXVlCisKICAgICAgICAgc2VsZi5fZmlsbF9hdHRhY2htZW50X2Zvcm0oZGVzY3Jp cHRpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGVfb2JqZWN0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJrX2Zvcl9yZXZpZXc9bWFya19m b3JfcmV2aWV3LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJrX2Zvcl9j b21taXRfcXVldWU9bWFya19mb3JfY29tbWl0X3F1ZXVlLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBtYXJrX2Zvcl9sYW5kaW5nPW1hcmtfZm9yX2xhbmRpbmcsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1pdF9mbGFnPWNvbW1pdF9mbGFnLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpc19wYXRjaD1UcnVlLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlbmFtZT1maWxlbmFtZSkKICAgICAgICAgaWYg Y29tbWVudF90ZXh0OgpAQCAtNzA4LDExICs3MTMsMTUgQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0 KToKICAgICAgICAgICAgICMgUGF0Y2ggZmlsZXMgYXJlIGFscmVhZHkgYmluYXJ5LCBzbyBubyBl bmNvZGluZyBuZWVkZWQuCiAgICAgICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShkaWZmLCBzdHIp KQogICAgICAgICAgICAgcGF0Y2hfZmlsZV9vYmplY3QgPSBTdHJpbmdJTy5TdHJpbmdJTyhkaWZm KQorICAgICAgICAgICAgY29tbWl0X2ZsYWcgPSBDb21taXRRdWV1ZUZsYWcubWFya19mb3Jfbm90 aGluZworICAgICAgICAgICAgaWYgbWFya19mb3JfY29tbWl0X3F1ZXVlOgorICAgICAgICAgICAg ICAgIGNvbW1pdF9mbGFnID0gQ29tbWl0UXVldWVGbGFnLm1hcmtfZm9yX2NvbW1pdF9xdWV1ZQor CiAgICAgICAgICAgICBzZWxmLl9maWxsX2F0dGFjaG1lbnRfZm9ybSgKICAgICAgICAgICAgICAg ICAgICAgcGF0Y2hfZGVzY3JpcHRpb24sCiAgICAgICAgICAgICAgICAgICAgIHBhdGNoX2ZpbGVf b2JqZWN0LAogICAgICAgICAgICAgICAgICAgICBtYXJrX2Zvcl9yZXZpZXc9bWFya19mb3JfcmV2 aWV3LAotICAgICAgICAgICAgICAgICAgICBtYXJrX2Zvcl9jb21taXRfcXVldWU9bWFya19mb3Jf Y29tbWl0X3F1ZXVlLAorICAgICAgICAgICAgICAgICAgICBjb21taXRfZmxhZz1jb21taXRfZmxh ZywKICAgICAgICAgICAgICAgICAgICAgaXNfcGF0Y2g9VHJ1ZSkKIAogICAgICAgICByZXNwb25z ZSA9IHNlbGYuYnJvd3Nlci5zdWJtaXQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX3VuaXR0ZXN0LnB5Cmlu ZGV4IDQ4MTdiZDYuLmNkMGI0MTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfdW5pdHRlc3QucHkKQEAg LTMwLDcgKzMwLDcgQEAgaW1wb3J0IHVuaXR0ZXN0MiBhcyB1bml0dGVzdAogaW1wb3J0IGRhdGV0 aW1lCiBpbXBvcnQgU3RyaW5nSU8KIAotZnJvbSAuYnVnemlsbGEgaW1wb3J0IEJ1Z3ppbGxhLCBC dWd6aWxsYVF1ZXJpZXMsIEVkaXRVc2Vyc1BhcnNlcgorZnJvbSAuYnVnemlsbGEgaW1wb3J0IEJ1 Z3ppbGxhLCBCdWd6aWxsYVF1ZXJpZXMsIENvbW1pdFF1ZXVlRmxhZywgRWRpdFVzZXJzUGFyc2Vy CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZyBpbXBvcnQgdXJscwogZnJvbSB3ZWJraXRw eS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IFJldmlld2VyLCBDb21taXR0ZXIsIENv bnRyaWJ1dG9yLCBDb21taXR0ZXJMaXN0CkBAIC0zMDcsMzQgKzMwNywzMCBAQCBJZ25vcmUgdGhp cyBidWcuICBKdXN0IGZvciB0ZXN0aW5nIGZhaWx1cmUgbW9kZXMgb2Ygd2Via2l0LXBhdGNoIGFu ZCB0aGUgY29tbWl0LQogICAgICAgICAgICAgY29tbWl0dGVycz1bQ29tbWl0dGVyKCJXZWJLaXQg Q29tbWl0dGVyIiwgImNvbW1pdHRlckB3ZWJraXQub3JnIildLAogICAgICAgICAgICAgY29udHJp YnV0b3JzPVtDb250cmlidXRvcigiV2ViS2l0IENvbnRyaWJ1dG9yIiwgImNvbnRyaWJ1dG9yQHdl YmtpdC5vcmciKV0pCiAKLSAgICAgICAgZGVmIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJr X2Zvcl9sYW5kaW5nLCBtYXJrX2Zvcl9jb21taXRfcXVldWUsIGV4cGVjdGVkLCB1c2VybmFtZT1O b25lKToKKyAgICAgICAgZGVmIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhjb21taXRfZmxhZywg ZXhwZWN0ZWQsIHVzZXJuYW1lPU5vbmUpOgogICAgICAgICAgICAgYnVnemlsbGEudXNlcm5hbWUg PSB1c2VybmFtZQogICAgICAgICAgICAgY2FwdHVyZSA9IE91dHB1dENhcHR1cmUoKQogICAgICAg ICAgICAgY2FwdHVyZS5jYXB0dXJlX291dHB1dCgpCiAgICAgICAgICAgICB0cnk6Ci0gICAgICAg ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChidWd6aWxsYS5fY29tbWl0X3F1ZXVlX2ZsYWcobWFy a19mb3JfbGFuZGluZz1tYXJrX2Zvcl9sYW5kaW5nLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9bWFy a19mb3JfY29tbWl0X3F1ZXVlKSwgZXhwZWN0ZWQpCisgICAgICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChidWd6aWxsYS5fY29tbWl0X3F1ZXVlX2ZsYWcoY29tbWl0X2ZsYWcpLCBleHBlY3Rl ZCkKICAgICAgICAgICAgIGZpbmFsbHk6CiAgICAgICAgICAgICAgICAgY2FwdHVyZS5yZXN0b3Jl X291dHB1dCgpCiAKLSAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKG1hcmtfZm9yX2xh bmRpbmc9RmFsc2UsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwgZXhwZWN0ZWQ9J1gnLCB1 c2VybmFtZT0ndW5rbm93bkB3ZWJraXQub3JnJykKLSAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1 ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9RmFsc2UsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1UcnVl LCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSd1bmtub3duQHdlYmtpdC5vcmcnKQotICAgICAgICBh c3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZz1GYWxzZSwgbWFya19mb3Jf Y29tbWl0X3F1ZXVlPVRydWUsIGV4cGVjdGVkPSc/JywgdXNlcm5hbWU9J3Vua25vd25Ad2Via2l0 Lm9yZycpCi0gICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5n PVRydWUsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1UcnVlLCBleHBlY3RlZD0nPycsIHVzZXJuYW1l PSd1bmtub3duQHdlYmtpdC5vcmcnKQotCi0gICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxh ZyhtYXJrX2Zvcl9sYW5kaW5nPUZhbHNlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9RmFsc2UsIGV4 cGVjdGVkPSdYJywgdXNlcm5hbWU9J2NvbnRyaWJ1dG9yQHdlYmtpdC5vcmcnKQotICAgICAgICBh c3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZz1GYWxzZSwgbWFya19mb3Jf Y29tbWl0X3F1ZXVlPVRydWUsIGV4cGVjdGVkPSc/JywgdXNlcm5hbWU9J2NvbnRyaWJ1dG9yQHdl YmtpdC5vcmcnKQotICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19mb3JfbGFu ZGluZz1UcnVlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9RmFsc2UsIGV4cGVjdGVkPSc/JywgdXNl cm5hbWU9J2NvbnRyaWJ1dG9yQHdlYmtpdC5vcmcnKQotICAgICAgICBhc3NlcnRfY29tbWl0X3F1 ZXVlX2ZsYWcobWFya19mb3JfbGFuZGluZz1UcnVlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9VHJ1 ZSwgZXhwZWN0ZWQ9Jz8nLCB1c2VybmFtZT0nY29udHJpYnV0b3JAd2Via2l0Lm9yZycpCi0KLSAg ICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9RmFsc2UsIG1h cmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwgZXhwZWN0ZWQ9J1gnLCB1c2VybmFtZT0nY29tbWl0 dGVyQHdlYmtpdC5vcmcnKQotICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcobWFya19m b3JfbGFuZGluZz1GYWxzZSwgbWFya19mb3JfY29tbWl0X3F1ZXVlPVRydWUsIGV4cGVjdGVkPSc/ JywgdXNlcm5hbWU9J2NvbW1pdHRlckB3ZWJraXQub3JnJykKLSAgICAgICAgYXNzZXJ0X2NvbW1p dF9xdWV1ZV9mbGFnKG1hcmtfZm9yX2xhbmRpbmc9VHJ1ZSwgbWFya19mb3JfY29tbWl0X3F1ZXVl PUZhbHNlLCBleHBlY3RlZD0nKycsIHVzZXJuYW1lPSdjb21taXR0ZXJAd2Via2l0Lm9yZycpCi0g ICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5nPVRydWUsIG1h cmtfZm9yX2NvbW1pdF9xdWV1ZT1UcnVlLCBleHBlY3RlZD0nKycsIHVzZXJuYW1lPSdjb21taXR0 ZXJAd2Via2l0Lm9yZycpCi0KLSAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKG1hcmtf Zm9yX2xhbmRpbmc9RmFsc2UsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwgZXhwZWN0ZWQ9 J1gnLCB1c2VybmFtZT0ncmV2aWV3ZXJAd2Via2l0Lm9yZycpCi0gICAgICAgIGFzc2VydF9jb21t aXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5nPUZhbHNlLCBtYXJrX2Zvcl9jb21taXRfcXVl dWU9VHJ1ZSwgZXhwZWN0ZWQ9Jz8nLCB1c2VybmFtZT0ncmV2aWV3ZXJAd2Via2l0Lm9yZycpCi0g ICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5nPVRydWUsIG1h cmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwgZXhwZWN0ZWQ9JysnLCB1c2VybmFtZT0ncmV2aWV3 ZXJAd2Via2l0Lm9yZycpCi0gICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhtYXJrX2Zv cl9sYW5kaW5nPVRydWUsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1UcnVlLCBleHBlY3RlZD0nKycs IHVzZXJuYW1lPSdyZXZpZXdlckB3ZWJraXQub3JnJykKKyAgICAgICAgYXNzZXJ0X2NvbW1pdF9x dWV1ZV9mbGFnKGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9ub3RoaW5nLCBl eHBlY3RlZD0nWCcsIHVzZXJuYW1lPSd1bmtub3duQHdlYmtpdC5vcmcnKQorICAgICAgICBhc3Nl cnRfY29tbWl0X3F1ZXVlX2ZsYWcoY29tbWl0X2ZsYWc9Q29tbWl0UXVldWVGbGFnLm1hcmtfZm9y X2NvbW1pdF9xdWV1ZSwgZXhwZWN0ZWQ9Jz8nLCB1c2VybmFtZT0ndW5rbm93bkB3ZWJraXQub3Jn JykKKyAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnPUNvbW1pdFF1 ZXVlRmxhZy5tYXJrX2Zvcl9sYW5kaW5nLCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSd1bmtub3du QHdlYmtpdC5vcmcnKQorCisgICAgICAgIGFzc2VydF9jb21taXRfcXVldWVfZmxhZyhjb21taXRf ZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19mb3Jfbm90aGluZywgZXhwZWN0ZWQ9J1gnLCB1c2Vy bmFtZT0nY29udHJpYnV0b3JAd2Via2l0Lm9yZycpCisgICAgICAgIGFzc2VydF9jb21taXRfcXVl dWVfZmxhZyhjb21taXRfZmxhZz1Db21taXRRdWV1ZUZsYWcubWFya19mb3JfY29tbWl0X3F1ZXVl LCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSdjb250cmlidXRvckB3ZWJraXQub3JnJykKKyAgICAg ICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVlRmxhZy5t YXJrX2Zvcl9sYW5kaW5nLCBleHBlY3RlZD0nPycsIHVzZXJuYW1lPSdjb250cmlidXRvckB3ZWJr aXQub3JnJykKKworICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVlX2ZsYWcoY29tbWl0X2ZsYWc9 Q29tbWl0UXVldWVGbGFnLm1hcmtfZm9yX25vdGhpbmcsIGV4cGVjdGVkPSdYJywgdXNlcm5hbWU9 J2NvbW1pdHRlckB3ZWJraXQub3JnJykKKyAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFn KGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9jb21taXRfcXVldWUsIGV4cGVj dGVkPSc/JywgdXNlcm5hbWU9J2NvbW1pdHRlckB3ZWJraXQub3JnJykKKyAgICAgICAgYXNzZXJ0 X2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9s YW5kaW5nLCBleHBlY3RlZD0nKycsIHVzZXJuYW1lPSdjb21taXR0ZXJAd2Via2l0Lm9yZycpCisK KyAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnPUNvbW1pdFF1ZXVl RmxhZy5tYXJrX2Zvcl9ub3RoaW5nLCBleHBlY3RlZD0nWCcsIHVzZXJuYW1lPSdyZXZpZXdlckB3 ZWJraXQub3JnJykKKyAgICAgICAgYXNzZXJ0X2NvbW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFn PUNvbW1pdFF1ZXVlRmxhZy5tYXJrX2Zvcl9jb21taXRfcXVldWUsIGV4cGVjdGVkPSc/JywgdXNl cm5hbWU9J3Jldmlld2VyQHdlYmtpdC5vcmcnKQorICAgICAgICBhc3NlcnRfY29tbWl0X3F1ZXVl X2ZsYWcoY29tbWl0X2ZsYWc9Q29tbWl0UXVldWVGbGFnLm1hcmtfZm9yX2xhbmRpbmcsIGV4cGVj dGVkPScrJywgdXNlcm5hbWU9J3Jldmlld2VyQHdlYmtpdC5vcmcnKQogCiAgICAgZGVmIHRlc3Rf X2NoZWNrX2NyZWF0ZV9idWdfcmVzcG9uc2Uoc2VsZik6CiAgICAgICAgIGJ1Z3ppbGxhID0gQnVn emlsbGEoKQo=