40389 2010-06-09 14:33:14 -0700 make rietveld upload faster and avoid posting to bug on errors 2010-06-09 17:28:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth cjerdonek eric jparent oldest_to_newest 236012 0 ojan 2010-06-09 14:33:14 -0700 make rietveld upload faster and avoid posting to bug on errors 236014 1 58297 ojan 2010-06-09 14:36:08 -0700 Created attachment 58297 Patch 236045 2 58297 abarth 2010-06-09 15:26:34 -0700 Comment on attachment 58297 Patch Looks good, but R- because of the race condition. WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:275 + return self._fetch_bug(bugs[0]).in_rietveld_queue_patches()[0] Is there a race condition where the first query sees the bug as having a rietveld? patch but this request doesn't? Wouldn't that cause use to throw an exception here? WebKitTools/Scripts/webkitpy/tool/commands/queues.py:338 + self._reject_patch(patch.id(), message) I'd pass the patch here for consistency with other queues. 236054 3 58301 ojan 2010-06-09 15:46:09 -0700 Created attachment 58301 Patch 236058 4 ojan 2010-06-09 15:47:33 -0700 (In reply to comment #2) > WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:275 > + return self._fetch_bug(bugs[0]).in_rietveld_queue_patches()[0] > Is there a race condition where the first query sees the bug as having a rietveld? patch but this request doesn't? Wouldn't that cause use to throw an exception here? Whoops. Fixed. > WebKitTools/Scripts/webkitpy/tool/commands/queues.py:338 > + self._reject_patch(patch.id(), message) > I'd pass the patch here for consistency with other queues. Actually, it seems like all the other queues pass the patch id around in the functions called from handle_script_error and handle_unexpected_error. 236080 5 58301 abarth 2010-06-09 16:37:08 -0700 Comment on attachment 58301 Patch I think you have a typo, but looks good otherwise. WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:274 + def fetch_patch(url): Normally we'd make this a private method. WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:275 + bugs = self._fetch_bug_ids_advanced_query(rietveld_queue_url) rietveld_queue_url -> url? WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:276 + patches = self._fetch_bug(bugs[0]).in_rietveld_queue_patches() Does in_rietveld_queue_patches cover r? too? 236088 6 ojan 2010-06-09 17:10:37 -0700 (In reply to comment #5) > WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:274 > + def fetch_patch(url): > Normally we'd make this a private method. Done. > WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:275 > + bugs = self._fetch_bug_ids_advanced_query(rietveld_queue_url) > rietveld_queue_url -> url? > > WebKitTools/Scripts/webkitpy/common/net/bugzilla.py:276 > + patches = self._fetch_bug(bugs[0]).in_rietveld_queue_patches() > Does in_rietveld_queue_patches cover r? too? Doh. Sorry, I didn't get around to running the queue through all the in-rietveld? patches and didn't hit this. Anyways, fixed both issues and confirmed that r? patches get uploaded correctly. 236095 7 ojan 2010-06-09 17:28:14 -0700 Committed r60924: <http://trac.webkit.org/changeset/60924> 58297 2010-06-09 14:36:08 -0700 2010-06-09 15:46:02 -0700 Patch bug-40389-20100609143607.patch text/plain 9721 ojan ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiNTIwNGYyYmY3NTlhMGM4MjM4ZGRmNzg3MDU0YmZkMzU0ZmU0NzE2Li4yZDM3NzM5 ZDY5MDljZjU2ZmJmYmVmMzNjZWZlNTAzNGJkNzhiZWU4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAK IDIwMTAtMDYtMDkgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtYWtlIHJpZXR2ZWxkIHVwbG9h ZCBmYXN0ZXIgYW5kIGF2b2lkIHBvc3RpbmcgdG8gYnVnIG9uIGVycm9ycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzODkKKworICAgICAgICBPbmx5 IGdyYWIgdGhlIGZpcnN0IGl0ZW0gb2YgdGhlIHVwbG9hZCBxdWV1ZSBpbnN0ZWFkIG9mIHRyeWlu ZworICAgICAgICB0byBjb21wdXRlIHRoZSB3aG9sZSBsaXN0IHVwZnJvbnQgKHdoaWNoIGlzIE8o bikgYnVnemlsbGEgbG9va3VwcyEpLgorCisgICAgICAgIEFsc28sIGRvbid0IHBvc3QgY29tbWVu dHMgdG8gdGhlIGJ1ZyB3aGVuIHVwbG9hZGluZyBmYWlscy4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3N0ZXBzZXF1ZW5jZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHk6CisKKzIwMTAtMDYtMDkgIE9qYW4gVmFmYWkgIDxvamFu QGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgogCiAgICAg ICAgIFJpZXR2ZWxkIHVwbG9hZCBxdWV1ZSBmYWlscyB3aGVuIHNldHRpbmcgaW4tcmlldHZlbGQg ZmxhZwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1 Z3ppbGxhLnB5CmluZGV4IDc1ZWM3MDEzZjVmNjUxNjFjNjVhZjgzODZkODRkYzAyNzAyNzJlNjMu LjY5MGE1ZTBlYzQ1ZjYxZjNhODYyMWNiMjFlZGUxMGQ0NjIyMzNlZDUgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEucHkKQEAgLTI3 MCwyMSArMjcwLDI0IEBAIGNsYXNzIEJ1Z3ppbGxhUXVlcmllcyhvYmplY3QpOgogICAgICAgICBy ZXR1cm4gc3VtKFtzZWxmLl9mZXRjaF9idWcoYnVnX2lkKS5jb21taXRfcXVldWVkX3BhdGNoZXMo KQogICAgICAgICAgICAgICAgICAgICBmb3IgYnVnX2lkIGluIHNlbGYuZmV0Y2hfYnVnX2lkc19m cm9tX2NvbW1pdF9xdWV1ZSgpXSwgW10pCiAKLSAgICBkZWYgX2ZldGNoX2J1Z19pZHNfZnJvbV9y aWV0dmVsZF9xdWV1ZShzZWxmKToKKyAgICBkZWYgZmV0Y2hfZmlyc3RfcGF0Y2hfZnJvbV9yaWV0 dmVsZF9xdWV1ZShzZWxmKToKKyAgICAgICAgZGVmIGZldGNoX3BhdGNoKGJ1Z3MpOgorICAgICAg ICAgICAgcmV0dXJuIHNlbGYuX2ZldGNoX2J1ZyhidWdzWzBdKS5pbl9yaWV0dmVsZF9xdWV1ZV9w YXRjaGVzKClbMF0KKwogICAgICAgICAjIHJpZXR2ZWxkLXF1ZXVlIHByb2Nlc3NlcyBpbi1yaWV0 dmVsZD8gcGF0Y2hlcyBhbmQgdGhlbiBtYXJrcyB0aGVtIGluLXJpZXR2ZWxkLS8rLgogICAgICAg ICAjIGluLXJpZXR2ZWxkPyBwYXRjaGVzCiAgICAgICAgIHJpZXR2ZWxkX3F1ZXVlX3VybCA9ICJi dWdsaXN0LmNnaT9xdWVyeV9mb3JtYXQ9YWR2YW5jZWQmYnVnX3N0YXR1cz1VTkNPTkZJUk1FRCZi dWdfc3RhdHVzPU5FVyZidWdfc3RhdHVzPUFTU0lHTkVEJmJ1Z19zdGF0dXM9UkVPUEVORUQmZmll bGQwLTAtMD1mbGFndHlwZXMubmFtZSZ0eXBlMC0wLTA9ZXF1YWxzJnZhbHVlMC0wLTA9aW4tcmll dHZlbGQlM0Ymb3JkZXI9TGFzdCtDaGFuZ2VkIgogICAgICAgICBpbl9yaWV0dmVsZF9idWdzID0g c2VsZi5fZmV0Y2hfYnVnX2lkc19hZHZhbmNlZF9xdWVyeShyaWV0dmVsZF9xdWV1ZV91cmwpCisg ICAgICAgIGlmIGxlbihpbl9yaWV0dmVsZF9idWdzKToKKyAgICAgICAgICAgIHJldHVybiBmZXRj aF9wYXRjaChpbl9yaWV0dmVsZF9idWdzKQogCiAgICAgICAgICMgcmV2aWV3PyBwYXRjaGVzIHRo YXQgZG9uJ3QgaGF2ZSBhbiBpbi1yaWV0dmVsZCBmbGFnLgogICAgICAgICByZXZpZXdfcXVldWVf dXJsID0gImJ1Z2xpc3QuY2dpP3F1ZXJ5X2Zvcm1hdD1hZHZhbmNlZCZidWdfc3RhdHVzPVVOQ09O RklSTUVEJmJ1Z19zdGF0dXM9TkVXJmJ1Z19zdGF0dXM9QVNTSUdORUQmYnVnX3N0YXR1cz1SRU9Q RU5FRCZmaWVsZDAtMC0wPWZsYWd0eXBlcy5uYW1lJnR5cGUwLTAtMD1lcXVhbHMmdmFsdWUwLTAt MD1yZXZpZXclM0YmZmllbGQwLTEtMD1mbGFndHlwZXMubmFtZSZ0eXBlMC0xLTA9bm90c3Vic3Ry aW5nJnZhbHVlMC0xLTA9aW4tcmlldHZlbGQmb3JkZXI9TGFzdCtDaGFuZ2VkIgotICAgICAgICBp bl9yaWV0dmVsZF9idWdzLmV4dGVuZChzZWxmLl9mZXRjaF9idWdfaWRzX2FkdmFuY2VkX3F1ZXJ5 KHJldmlld19xdWV1ZV91cmwpKQotCi0gICAgICAgIHJldHVybiBpbl9yaWV0dmVsZF9idWdzCisg ICAgICAgIHJldmlld19idWdzID0gc2VsZi5fZmV0Y2hfYnVnX2lkc19hZHZhbmNlZF9xdWVyeShy ZXZpZXdfcXVldWVfdXJsKQorICAgICAgICBpZiBsZW4ocmV2aWV3X2J1Z3MpOgorICAgICAgICAg ICAgcmV0dXJuIGZldGNoX3BhdGNoKHJldmlld19idWdzKQogCi0gICAgZGVmIGZldGNoX3BhdGNo ZXNfZnJvbV9yaWV0dmVsZF9xdWV1ZShzZWxmKToKLSAgICAgICAgcmV0dXJuIHN1bShbc2VsZi5f ZmV0Y2hfYnVnKGJ1Z19pZCkuaW5fcmlldHZlbGRfcXVldWVfcGF0Y2hlcygpCi0gICAgICAgICAg ICAgICAgICAgIGZvciBidWdfaWQgaW4gc2VsZi5fZmV0Y2hfYnVnX2lkc19mcm9tX3JpZXR2ZWxk X3F1ZXVlKCldLCBbXSkKKyAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIGRlZiBfZmV0Y2hfYnVn X2lkc19mcm9tX3Jldmlld19xdWV1ZShzZWxmKToKICAgICAgICAgcmV2aWV3X3F1ZXVlX3VybCA9 ICJidWdsaXN0LmNnaT9xdWVyeV9mb3JtYXQ9YWR2YW5jZWQmYnVnX3N0YXR1cz1VTkNPTkZJUk1F RCZidWdfc3RhdHVzPU5FVyZidWdfc3RhdHVzPUFTU0lHTkVEJmJ1Z19zdGF0dXM9UkVPUEVORUQm ZmllbGQwLTAtMD1mbGFndHlwZXMubmFtZSZ0eXBlMC0wLTA9ZXF1YWxzJnZhbHVlMC0wLTA9cmV2 aWV3PyIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9xdWV1ZXMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcXVldWVzLnB5CmluZGV4IDg5YzRmMTU2YjAyZDk3ZTRjYmYzZjdhOThlMDVjYWE5ZTQyY2U4 YjMuLmUyOTU3ZDNiZjRlZGI1NGQwMmYwZTNmNDIwMmJlNmIwZTk4ZGM5NmMgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weQpA QCAtMjg5LDYgKzI4OSwxMiBAQCBjbGFzcyBDb21taXRRdWV1ZShBYnN0cmFjdFBhdGNoUXVldWUs IFN0ZXBTZXF1ZW5jZUVycm9ySGFuZGxlcik6CiAgICAgICAgIHNlbGYuY29tbWl0dGVyX3ZhbGlk YXRvci5yZWplY3RfcGF0Y2hfZnJvbV9jb21taXRfcXVldWUocGF0Y2guaWQoKSwgbWVzc2FnZSkK IAogICAgICMgU3RlcFNlcXVlbmNlRXJyb3JIYW5kbGVyIG1ldGhvZHMKKyAgICBAc3RhdGljbWV0 aG9kCisgICAgZGVmIF9lcnJvcl9tZXNzYWdlX2Zvcl9idWcodG9vbCwgc3RhdHVzX2lkLCBzY3Jp cHRfZXJyb3IpOgorICAgICAgICBpZiBub3Qgc2NyaXB0X2Vycm9yLm91dHB1dDoKKyAgICAgICAg ICAgIHJldHVybiBzY3JpcHRfZXJyb3IubWVzc2FnZV93aXRoX291dHB1dCgpCisgICAgICAgIHJl c3VsdHNfbGluayA9IHRvb2wuc3RhdHVzX3NlcnZlci5yZXN1bHRzX3VybF9mb3Jfc3RhdHVzKHN0 YXR1c19pZCkKKyAgICAgICAgcmV0dXJuICIlc1xuRnVsbCBvdXRwdXQ6ICVzIiAlIChzY3JpcHRf ZXJyb3IubWVzc2FnZV93aXRoX291dHB1dCgpLCByZXN1bHRzX2xpbmspCiAKICAgICBAY2xhc3Nt ZXRob2QKICAgICBkZWYgaGFuZGxlX3NjcmlwdF9lcnJvcihjbHMsIHRvb2wsIHN0YXRlLCBzY3Jp cHRfZXJyb3IpOgpAQCAtMzA2LDkgKzMxMiw5IEBAIGNsYXNzIFJpZXR2ZWxkVXBsb2FkUXVldWUo QWJzdHJhY3RQYXRjaFF1ZXVlLCBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIpOgogICAgICMgQWJz dHJhY3RQYXRjaFF1ZXVlIG1ldGhvZHMKIAogICAgIGRlZiBuZXh0X3dvcmtfaXRlbShzZWxmKToK LSAgICAgICAgcGF0Y2hlcyA9IHNlbGYudG9vbC5idWdzLnF1ZXJpZXMuZmV0Y2hfcGF0Y2hlc19m cm9tX3JpZXR2ZWxkX3F1ZXVlKCkKLSAgICAgICAgaWYgcGF0Y2hlczoKLSAgICAgICAgICAgIHJl dHVybiBwYXRjaGVzWzBdCisgICAgICAgIHBhdGNoX2lkID0gc2VsZi50b29sLmJ1Z3MucXVlcmll cy5mZXRjaF9maXJzdF9wYXRjaF9mcm9tX3JpZXR2ZWxkX3F1ZXVlKCkKKyAgICAgICAgaWYgcGF0 Y2hfaWQ6CisgICAgICAgICAgICByZXR1cm4gcGF0Y2hfaWQKICAgICAgICAgc2VsZi5fdXBkYXRl X3N0YXR1cygiRW1wdHkgcXVldWUiKQogCiAgICAgZGVmIHNob3VsZF9wcm9jZWVkX3dpdGhfd29y a19pdGVtKHNlbGYsIHBhdGNoKToKQEAgLTMyNSwxOSArMzMxLDE4IEBAIGNsYXNzIFJpZXR2ZWxk VXBsb2FkUXVldWUoQWJzdHJhY3RQYXRjaFF1ZXVlLCBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIp OgogICAgICAgICAgICAgICAgIHNlbGYuX2RpZF9mYWlsKHBhdGNoKQogICAgICAgICAgICAgcmFp c2UgZQogCi0gICAgZGVmIF9yZWplY3RfcGF0Y2goc2VsZiwgcGF0Y2gsIG1lc3NhZ2UpOgotICAg ICAgICBjb21tZW50X3RleHQgPSAiQ291bGQgbm90IHVwbG9hZCBwYXRjaCAlcyB0byByaWV0dmVs ZC4gUmlldHZlbGQgaXMgZG93biBvciB0aGVyZSdzIGEgYnVnIGluIHRoZSB1cGxvYWQgYm90LiIg JSBwYXRjaC5pZCgpCi0gICAgICAgIHNlbGYudG9vbC5idWdzLnNldF9mbGFnX29uX2F0dGFjaG1l bnQocGF0Y2guaWQoKSwgImluLXJpZXR2ZWxkIiwgIi0iLCBjb21tZW50X3RleHQsIG1lc3NhZ2Up CisgICAgZGVmIF9yZWplY3RfcGF0Y2goc2VsZiwgcGF0Y2hfaWQsIG1lc3NhZ2UpOgorICAgICAg ICBzZWxmLnRvb2wuYnVncy5zZXRfZmxhZ19vbl9hdHRhY2htZW50KHBhdGNoX2lkLCAiaW4tcmll dHZlbGQiLCAiLSIpCiAKICAgICBkZWYgaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3Ioc2VsZiwgcGF0 Y2gsIG1lc3NhZ2UpOgotICAgICAgICBzZWxmLl9yZWplY3RfcGF0Y2gocGF0Y2gsIG1lc3NhZ2Up CisgICAgICAgIHNlbGYuX3JlamVjdF9wYXRjaChwYXRjaC5pZCgpLCBtZXNzYWdlKQogCiAgICAg IyBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIgbWV0aG9kcwogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIGhhbmRsZV9zY3JpcHRfZXJyb3IoY2xzLCB0b29sLCBzdGF0ZSwgc2NyaXB0X2Vycm9y KToKICAgICAgICAgc3RhdHVzX2lkID0gY2xzLl91cGRhdGVfc3RhdHVzX2Zvcl9zY3JpcHRfZXJy b3IodG9vbCwgc3RhdGUsIHNjcmlwdF9lcnJvcikKLSAgICAgICAgY2xzLl9yZWplY3RfcGF0Y2go cGF0Y2gsIGNscy5fZXJyb3JfbWVzc2FnZV9mb3JfYnVnKHRvb2wsIHN0YXR1c19pZCwgc2NyaXB0 X2Vycm9yKSkKKyAgICAgICAgY2xzLl9yZWplY3RfcGF0Y2goc3RhdGVbInBhdGNoIl0uaWQoKSkK IAogCiBjbGFzcyBBYnN0cmFjdFJldmlld1F1ZXVlKEFic3RyYWN0UGF0Y2hRdWV1ZSwgUGVyc2lz dGVudFBhdGNoQ29sbGVjdGlvbkRlbGVnYXRlLCBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIpOgpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1 ZXVlc191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9xdWV1ZXNfdW5pdHRlc3QucHkKaW5kZXggOGY4MTljMmVkYTEwYThlN2U5ZDNjYWRiYzkw ZmI3MWQ3NGYwMzRmOS4uNjM4ODM3MmJkOTI1Y2U4MzJkZTExNTkzMzZiMTE2YmQ1ZmVjNDhjMSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1 ZXVlc191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5CkBAIC0yMDUsNyArMjA1LDcgQEAgY2xhc3MgUmll dHZlbGRVcGxvYWRRdWV1ZVRlc3QoUXVldWVzVGVzdCk6CiAgICAgICAgICAgICAiYmVnaW5fd29y a19xdWV1ZSI6ICJDQVVUSU9OOiByaWV0dmVsZC11cGxvYWQtcXVldWUgd2lsbCBkaXNjYXJkIGFs bCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmluZyBXZWJLaXQgcmlldHZlbGQtdXBsb2Fk LXF1ZXVlLlxuIiAlIE1vY2tTQ00uZmFrZV9jaGVja291dF9yb290LAogICAgICAgICAgICAgInNo b3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6IHJpZXR2 ZWxkLXVwbG9hZC1xdWV1ZSBVcGxvYWRpbmcgcGF0Y2hcbiIsCiAgICAgICAgICAgICAicHJvY2Vz c193b3JrX2l0ZW0iOiAiTU9DSzogdXBkYXRlX3N0YXR1czogcmlldHZlbGQtdXBsb2FkLXF1ZXVl IFBhc3NcbiIsCi0gICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBz ZXR0aW5nIGZsYWcgJ2luLXJpZXR2ZWxkJyB0byAnLScgb24gYXR0YWNobWVudCAnMTIzNCcgd2l0 aCBjb21tZW50ICdDb3VsZCBub3QgdXBsb2FkIHBhdGNoIDEyMzQgdG8gcmlldHZlbGQuIFJpZXR2 ZWxkIGlzIGRvd24gb3IgdGhlcmUncyBhIGJ1ZyBpbiB0aGUgdXBsb2FkIGJvdC4nIGFuZCBhZGRp dGlvbmFsIGNvbW1lbnQgJ01vY2sgZXJyb3IgbWVzc2FnZSdcbiIsCisgICAgICAgICAgICAiaGFu ZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0aW5nIGZsYWcgJ2luLXJpZXR2ZWxkJyB0 byAnLScgb24gYXR0YWNobWVudCAnMTIzNCcgd2l0aCBjb21tZW50ICdOb25lJyBhbmQgYWRkaXRp b25hbCBjb21tZW50ICdOb25lJ1xuIiwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFzc2VydF9x dWV1ZV9vdXRwdXRzKFJpZXR2ZWxkVXBsb2FkUXVldWUoKSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVj dGVkX3N0ZGVycikKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3N0ZXBzZXF1ZW5jZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9zdGVwc2VxdWVuY2UucHkKaW5kZXggNjM3MDY4ZTg5ODg1NTY4NmJk YThkZTQ2MTk4NTBlMjYzMmE1NGE3OC4uYzZkZTc5ZjBmNzM1NzAyOWVmMWVhZDg3MjgxMmI3OTU4 ZTJkZmJhZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3N0ZXBzZXF1ZW5jZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvc3RlcHNlcXVlbmNlLnB5CkBAIC0zNSwxNyArMzUsNiBAQCBmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZGVwcmVjYXRlZF9sb2dnaW5nIGltcG9ydCBsb2cKIAogCiBj bGFzcyBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIoKToKLSAgICAjIEZJWE1FOiBTdGVwU2VxdWVu Y2VFcnJvckhhbmRsZXIgaXMganVzdCBhbiBpbnRlcmZhY2UgZGVmaW5pdGlvbi4KLSAgICAjIEl0 IHNob3VsZG4ndCBoYXZlIGFueSBpbXBsZW1lbnRhdGlvbnMuCi0gICAgIyBDcmVhdGUgYW4gaW50 ZXJtZWRpYXRlIGNsYXNzIHRoYXQgaW5oZXJpdHMgZnJvbSBTdGVwU2VxdWVuY2VFcnJvckhhbmRs ZXIKLSAgICAjIHRoYXQgdGhlIGFwcHJvcHJpYXRlIHF1ZXVlcyBpbmhlcml0IGZyb20uCi0gICAg QHN0YXRpY21ldGhvZAotICAgIGRlZiBfZXJyb3JfbWVzc2FnZV9mb3JfYnVnKHRvb2wsIHN0YXR1 c19pZCwgc2NyaXB0X2Vycm9yKToKLSAgICAgICAgaWYgbm90IHNjcmlwdF9lcnJvci5vdXRwdXQ6 Ci0gICAgICAgICAgICByZXR1cm4gc2NyaXB0X2Vycm9yLm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKQot ICAgICAgICByZXN1bHRzX2xpbmsgPSB0b29sLnN0YXR1c19zZXJ2ZXIucmVzdWx0c191cmxfZm9y X3N0YXR1cyhzdGF0dXNfaWQpCi0gICAgICAgIHJldHVybiAiJXNcbkZ1bGwgb3V0cHV0OiAlcyIg JSAoc2NyaXB0X2Vycm9yLm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKSwgcmVzdWx0c19saW5rKQotCiAg ICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGhhbmRsZV9zY3JpcHRfZXJyb3IoY2xzLCB0b29sLCBw YXRjaCwgc2NyaXB0X2Vycm9yKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwg InN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvbW9ja3Rvb2wucHkKaW5kZXggZTA0ZWJlZDY0NzI5Yzk2ODRkMzM4NDY5ODM0M2I3 NDAwNDE2MTU4MS4uYmVmMWE2OWE2ZGU2OWRiMjVhNTk5MGY1NjkzN2M4YzkwZjE2ZGZkNSAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weQpAQCAtMjI1 LDggKzIyNSwxMiBAQCBjbGFzcyBNb2NrQnVnemlsbGFRdWVyaWVzKE1vY2spOgogICAgIGRlZiBm ZXRjaF9wYXRjaGVzX2Zyb21fcGVuZGluZ19jb21taXRfbGlzdChzZWxmKToKICAgICAgICAgcmV0 dXJuIHN1bShbYnVnLnJldmlld2VkX3BhdGNoZXMoKSBmb3IgYnVnIGluIHNlbGYuX2FsbF9idWdz KCldLCBbXSkKIAotICAgIGRlZiBmZXRjaF9wYXRjaGVzX2Zyb21fcmlldHZlbGRfcXVldWUoc2Vs Zik6Ci0gICAgICAgIHJldHVybiBzdW0oW2J1Zy5pbl9yaWV0dmVsZF9xdWV1ZV9wYXRjaGVzKCkg Zm9yIGJ1ZyBpbiBzZWxmLl9hbGxfYnVncygpXSwgW10pCisgICAgZGVmIGZldGNoX2ZpcnN0X3Bh dGNoX2Zyb21fcmlldHZlbGRfcXVldWUoc2VsZik6CisgICAgICAgIGZvciBidWcgaW4gc2VsZi5f YWxsX2J1Z3MoKToKKyAgICAgICAgICAgIHBhdGNoZXMgPSBidWcuaW5fcmlldHZlbGRfcXVldWVf cGF0Y2hlcygpCisgICAgICAgICAgICBpZiBsZW4ocGF0Y2hlcyk6CisgICAgICAgICAgICAgICAg cmV0dXJuIHBhdGNoZXNbMF0KKyAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdObyBwYXRjaGVzIGlu IHRoZSByaWV0dmVsZCBxdWV1ZScpCiAKICMgRklYTUU6IEJ1Z3ppbGxhIGlzIHRoZSB3cm9uZyBN b2NrLXBvaW50LiAgT25jZSB3ZSBoYXZlIGEgQnVnemlsbGFOZXR3b3JrCiAjICAgICAgICBjbGFz cyB3ZSBzaG91bGQgbW9jayB0aGF0IGluc3RlYWQuCg== 58301 2010-06-09 15:46:09 -0700 2010-06-09 16:46:20 -0700 Patch bug-40389-20100609154608.patch text/plain 9802 ojan ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiNTIwNGYyYmY3NTlhMGM4MjM4ZGRmNzg3MDU0YmZkMzU0ZmU0NzE2Li4yZDM3NzM5 ZDY5MDljZjU2ZmJmYmVmMzNjZWZlNTAzNGJkNzhiZWU4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAK IDIwMTAtMDYtMDkgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtYWtlIHJpZXR2ZWxkIHVwbG9h ZCBmYXN0ZXIgYW5kIGF2b2lkIHBvc3RpbmcgdG8gYnVnIG9uIGVycm9ycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzODkKKworICAgICAgICBPbmx5 IGdyYWIgdGhlIGZpcnN0IGl0ZW0gb2YgdGhlIHVwbG9hZCBxdWV1ZSBpbnN0ZWFkIG9mIHRyeWlu ZworICAgICAgICB0byBjb21wdXRlIHRoZSB3aG9sZSBsaXN0IHVwZnJvbnQgKHdoaWNoIGlzIE8o bikgYnVnemlsbGEgbG9va3VwcyEpLgorCisgICAgICAgIEFsc28sIGRvbid0IHBvc3QgY29tbWVu dHMgdG8gdGhlIGJ1ZyB3aGVuIHVwbG9hZGluZyBmYWlscy4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3N0ZXBzZXF1ZW5jZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHk6CisKKzIwMTAtMDYtMDkgIE9qYW4gVmFmYWkgIDxvamFu QGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgogCiAgICAg ICAgIFJpZXR2ZWxkIHVwbG9hZCBxdWV1ZSBmYWlscyB3aGVuIHNldHRpbmcgaW4tcmlldHZlbGQg ZmxhZwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1 Z3ppbGxhLnB5CmluZGV4IDc1ZWM3MDEzZjVmNjUxNjFjNjVhZjgzODZkODRkYzAyNzAyNzJlNjMu LjZhMzQ5ZGY4ZDRlOWU0OGRjNDI2MjE5YTJkOGY2MGM5YjJlYzk3OTQgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEucHkKQEAgLTI3 MCwyMSArMjcwLDI2IEBAIGNsYXNzIEJ1Z3ppbGxhUXVlcmllcyhvYmplY3QpOgogICAgICAgICBy ZXR1cm4gc3VtKFtzZWxmLl9mZXRjaF9idWcoYnVnX2lkKS5jb21taXRfcXVldWVkX3BhdGNoZXMo KQogICAgICAgICAgICAgICAgICAgICBmb3IgYnVnX2lkIGluIHNlbGYuZmV0Y2hfYnVnX2lkc19m cm9tX2NvbW1pdF9xdWV1ZSgpXSwgW10pCiAKLSAgICBkZWYgX2ZldGNoX2J1Z19pZHNfZnJvbV9y aWV0dmVsZF9xdWV1ZShzZWxmKToKKyAgICBkZWYgZmV0Y2hfZmlyc3RfcGF0Y2hfZnJvbV9yaWV0 dmVsZF9xdWV1ZShzZWxmKToKKyAgICAgICAgZGVmIGZldGNoX3BhdGNoKHVybCk6CisgICAgICAg ICAgICBidWdzID0gc2VsZi5fZmV0Y2hfYnVnX2lkc19hZHZhbmNlZF9xdWVyeShyaWV0dmVsZF9x dWV1ZV91cmwpCisgICAgICAgICAgICBwYXRjaGVzID0gc2VsZi5fZmV0Y2hfYnVnKGJ1Z3NbMF0p LmluX3JpZXR2ZWxkX3F1ZXVlX3BhdGNoZXMoKQorICAgICAgICAgICAgcmV0dXJuIHBhdGNoZXNb MF0gaWYgbGVuKHBhdGNoZXMpIGVsc2UgTm9uZQorCiAgICAgICAgICMgcmlldHZlbGQtcXVldWUg cHJvY2Vzc2VzIGluLXJpZXR2ZWxkPyBwYXRjaGVzIGFuZCB0aGVuIG1hcmtzIHRoZW0gaW4tcmll dHZlbGQtLysuCiAgICAgICAgICMgaW4tcmlldHZlbGQ/IHBhdGNoZXMKICAgICAgICAgcmlldHZl bGRfcXVldWVfdXJsID0gImJ1Z2xpc3QuY2dpP3F1ZXJ5X2Zvcm1hdD1hZHZhbmNlZCZidWdfc3Rh dHVzPVVOQ09ORklSTUVEJmJ1Z19zdGF0dXM9TkVXJmJ1Z19zdGF0dXM9QVNTSUdORUQmYnVnX3N0 YXR1cz1SRU9QRU5FRCZmaWVsZDAtMC0wPWZsYWd0eXBlcy5uYW1lJnR5cGUwLTAtMD1lcXVhbHMm dmFsdWUwLTAtMD1pbi1yaWV0dmVsZCUzRiZvcmRlcj1MYXN0K0NoYW5nZWQiCi0gICAgICAgIGlu X3JpZXR2ZWxkX2J1Z3MgPSBzZWxmLl9mZXRjaF9idWdfaWRzX2FkdmFuY2VkX3F1ZXJ5KHJpZXR2 ZWxkX3F1ZXVlX3VybCkKKyAgICAgICAgcGF0Y2ggPSBmZXRjaF9wYXRjaChyaWV0dmVsZF9xdWV1 ZV91cmwpCisgICAgICAgIGlmIHBhdGNoOgorICAgICAgICAgICAgcmV0dXJuIHBhdGNoCiAKICAg ICAgICAgIyByZXZpZXc/IHBhdGNoZXMgdGhhdCBkb24ndCBoYXZlIGFuIGluLXJpZXR2ZWxkIGZs YWcuCiAgICAgICAgIHJldmlld19xdWV1ZV91cmwgPSAiYnVnbGlzdC5jZ2k/cXVlcnlfZm9ybWF0 PWFkdmFuY2VkJmJ1Z19zdGF0dXM9VU5DT05GSVJNRUQmYnVnX3N0YXR1cz1ORVcmYnVnX3N0YXR1 cz1BU1NJR05FRCZidWdfc3RhdHVzPVJFT1BFTkVEJmZpZWxkMC0wLTA9ZmxhZ3R5cGVzLm5hbWUm dHlwZTAtMC0wPWVxdWFscyZ2YWx1ZTAtMC0wPXJldmlldyUzRiZmaWVsZDAtMS0wPWZsYWd0eXBl cy5uYW1lJnR5cGUwLTEtMD1ub3RzdWJzdHJpbmcmdmFsdWUwLTEtMD1pbi1yaWV0dmVsZCZvcmRl cj1MYXN0K0NoYW5nZWQiCi0gICAgICAgIGluX3JpZXR2ZWxkX2J1Z3MuZXh0ZW5kKHNlbGYuX2Zl dGNoX2J1Z19pZHNfYWR2YW5jZWRfcXVlcnkocmV2aWV3X3F1ZXVlX3VybCkpCi0KLSAgICAgICAg cmV0dXJuIGluX3JpZXR2ZWxkX2J1Z3MKKyAgICAgICAgcGF0Y2ggPSBmZXRjaF9wYXRjaChyZXZp ZXdfcXVldWVfdXJsKQorICAgICAgICBpZiBwYXRjaDoKKyAgICAgICAgICAgIHJldHVybiBwYXRj aAogCi0gICAgZGVmIGZldGNoX3BhdGNoZXNfZnJvbV9yaWV0dmVsZF9xdWV1ZShzZWxmKToKLSAg ICAgICAgcmV0dXJuIHN1bShbc2VsZi5fZmV0Y2hfYnVnKGJ1Z19pZCkuaW5fcmlldHZlbGRfcXVl dWVfcGF0Y2hlcygpCi0gICAgICAgICAgICAgICAgICAgIGZvciBidWdfaWQgaW4gc2VsZi5fZmV0 Y2hfYnVnX2lkc19mcm9tX3JpZXR2ZWxkX3F1ZXVlKCldLCBbXSkKKyAgICAgICAgcmV0dXJuIE5v bmUKIAogICAgIGRlZiBfZmV0Y2hfYnVnX2lkc19mcm9tX3Jldmlld19xdWV1ZShzZWxmKToKICAg ICAgICAgcmV2aWV3X3F1ZXVlX3VybCA9ICJidWdsaXN0LmNnaT9xdWVyeV9mb3JtYXQ9YWR2YW5j ZWQmYnVnX3N0YXR1cz1VTkNPTkZJUk1FRCZidWdfc3RhdHVzPU5FVyZidWdfc3RhdHVzPUFTU0lH TkVEJmJ1Z19zdGF0dXM9UkVPUEVORUQmZmllbGQwLTAtMD1mbGFndHlwZXMubmFtZSZ0eXBlMC0w LTA9ZXF1YWxzJnZhbHVlMC0wLTA9cmV2aWV3PyIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IDg5YzRmMTU2YjAyZDk3 ZTRjYmYzZjdhOThlMDVjYWE5ZTQyY2U4YjMuLmUyOTU3ZDNiZjRlZGI1NGQwMmYwZTNmNDIwMmJl NmIwZTk4ZGM5NmMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9xdWV1ZXMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3F1ZXVlcy5weQpAQCAtMjg5LDYgKzI4OSwxMiBAQCBjbGFzcyBDb21taXRR dWV1ZShBYnN0cmFjdFBhdGNoUXVldWUsIFN0ZXBTZXF1ZW5jZUVycm9ySGFuZGxlcik6CiAgICAg ICAgIHNlbGYuY29tbWl0dGVyX3ZhbGlkYXRvci5yZWplY3RfcGF0Y2hfZnJvbV9jb21taXRfcXVl dWUocGF0Y2guaWQoKSwgbWVzc2FnZSkKIAogICAgICMgU3RlcFNlcXVlbmNlRXJyb3JIYW5kbGVy IG1ldGhvZHMKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9lcnJvcl9tZXNzYWdlX2Zvcl9i dWcodG9vbCwgc3RhdHVzX2lkLCBzY3JpcHRfZXJyb3IpOgorICAgICAgICBpZiBub3Qgc2NyaXB0 X2Vycm9yLm91dHB1dDoKKyAgICAgICAgICAgIHJldHVybiBzY3JpcHRfZXJyb3IubWVzc2FnZV93 aXRoX291dHB1dCgpCisgICAgICAgIHJlc3VsdHNfbGluayA9IHRvb2wuc3RhdHVzX3NlcnZlci5y ZXN1bHRzX3VybF9mb3Jfc3RhdHVzKHN0YXR1c19pZCkKKyAgICAgICAgcmV0dXJuICIlc1xuRnVs bCBvdXRwdXQ6ICVzIiAlIChzY3JpcHRfZXJyb3IubWVzc2FnZV93aXRoX291dHB1dCgpLCByZXN1 bHRzX2xpbmspCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgaGFuZGxlX3NjcmlwdF9lcnJv cihjbHMsIHRvb2wsIHN0YXRlLCBzY3JpcHRfZXJyb3IpOgpAQCAtMzA2LDkgKzMxMiw5IEBAIGNs YXNzIFJpZXR2ZWxkVXBsb2FkUXVldWUoQWJzdHJhY3RQYXRjaFF1ZXVlLCBTdGVwU2VxdWVuY2VF cnJvckhhbmRsZXIpOgogICAgICMgQWJzdHJhY3RQYXRjaFF1ZXVlIG1ldGhvZHMKIAogICAgIGRl ZiBuZXh0X3dvcmtfaXRlbShzZWxmKToKLSAgICAgICAgcGF0Y2hlcyA9IHNlbGYudG9vbC5idWdz LnF1ZXJpZXMuZmV0Y2hfcGF0Y2hlc19mcm9tX3JpZXR2ZWxkX3F1ZXVlKCkKLSAgICAgICAgaWYg cGF0Y2hlczoKLSAgICAgICAgICAgIHJldHVybiBwYXRjaGVzWzBdCisgICAgICAgIHBhdGNoX2lk ID0gc2VsZi50b29sLmJ1Z3MucXVlcmllcy5mZXRjaF9maXJzdF9wYXRjaF9mcm9tX3JpZXR2ZWxk X3F1ZXVlKCkKKyAgICAgICAgaWYgcGF0Y2hfaWQ6CisgICAgICAgICAgICByZXR1cm4gcGF0Y2hf aWQKICAgICAgICAgc2VsZi5fdXBkYXRlX3N0YXR1cygiRW1wdHkgcXVldWUiKQogCiAgICAgZGVm IHNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHNlbGYsIHBhdGNoKToKQEAgLTMyNSwxOSAr MzMxLDE4IEBAIGNsYXNzIFJpZXR2ZWxkVXBsb2FkUXVldWUoQWJzdHJhY3RQYXRjaFF1ZXVlLCBT dGVwU2VxdWVuY2VFcnJvckhhbmRsZXIpOgogICAgICAgICAgICAgICAgIHNlbGYuX2RpZF9mYWls KHBhdGNoKQogICAgICAgICAgICAgcmFpc2UgZQogCi0gICAgZGVmIF9yZWplY3RfcGF0Y2goc2Vs ZiwgcGF0Y2gsIG1lc3NhZ2UpOgotICAgICAgICBjb21tZW50X3RleHQgPSAiQ291bGQgbm90IHVw bG9hZCBwYXRjaCAlcyB0byByaWV0dmVsZC4gUmlldHZlbGQgaXMgZG93biBvciB0aGVyZSdzIGEg YnVnIGluIHRoZSB1cGxvYWQgYm90LiIgJSBwYXRjaC5pZCgpCi0gICAgICAgIHNlbGYudG9vbC5i dWdzLnNldF9mbGFnX29uX2F0dGFjaG1lbnQocGF0Y2guaWQoKSwgImluLXJpZXR2ZWxkIiwgIi0i LCBjb21tZW50X3RleHQsIG1lc3NhZ2UpCisgICAgZGVmIF9yZWplY3RfcGF0Y2goc2VsZiwgcGF0 Y2hfaWQsIG1lc3NhZ2UpOgorICAgICAgICBzZWxmLnRvb2wuYnVncy5zZXRfZmxhZ19vbl9hdHRh Y2htZW50KHBhdGNoX2lkLCAiaW4tcmlldHZlbGQiLCAiLSIpCiAKICAgICBkZWYgaGFuZGxlX3Vu ZXhwZWN0ZWRfZXJyb3Ioc2VsZiwgcGF0Y2gsIG1lc3NhZ2UpOgotICAgICAgICBzZWxmLl9yZWpl Y3RfcGF0Y2gocGF0Y2gsIG1lc3NhZ2UpCisgICAgICAgIHNlbGYuX3JlamVjdF9wYXRjaChwYXRj aC5pZCgpLCBtZXNzYWdlKQogCiAgICAgIyBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIgbWV0aG9k cwogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGhhbmRsZV9zY3JpcHRfZXJyb3IoY2xzLCB0 b29sLCBzdGF0ZSwgc2NyaXB0X2Vycm9yKToKICAgICAgICAgc3RhdHVzX2lkID0gY2xzLl91cGRh dGVfc3RhdHVzX2Zvcl9zY3JpcHRfZXJyb3IodG9vbCwgc3RhdGUsIHNjcmlwdF9lcnJvcikKLSAg ICAgICAgY2xzLl9yZWplY3RfcGF0Y2gocGF0Y2gsIGNscy5fZXJyb3JfbWVzc2FnZV9mb3JfYnVn KHRvb2wsIHN0YXR1c19pZCwgc2NyaXB0X2Vycm9yKSkKKyAgICAgICAgY2xzLl9yZWplY3RfcGF0 Y2goc3RhdGVbInBhdGNoIl0uaWQoKSkKIAogCiBjbGFzcyBBYnN0cmFjdFJldmlld1F1ZXVlKEFi c3RyYWN0UGF0Y2hRdWV1ZSwgUGVyc2lzdGVudFBhdGNoQ29sbGVjdGlvbkRlbGVnYXRlLCBTdGVw U2VxdWVuY2VFcnJvckhhbmRsZXIpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3QucHkKaW5kZXggOGY4 MTljMmVkYTEwYThlN2U5ZDNjYWRiYzkwZmI3MWQ3NGYwMzRmOS4uNjM4ODM3MmJkOTI1Y2U4MzJk ZTExNTkzMzZiMTE2YmQ1ZmVjNDhjMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5CkBAIC0y MDUsNyArMjA1LDcgQEAgY2xhc3MgUmlldHZlbGRVcGxvYWRRdWV1ZVRlc3QoUXVldWVzVGVzdCk6 CiAgICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSI6ICJDQVVUSU9OOiByaWV0dmVsZC11cGxv YWQtcXVldWUgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmlu ZyBXZWJLaXQgcmlldHZlbGQtdXBsb2FkLXF1ZXVlLlxuIiAlIE1vY2tTQ00uZmFrZV9jaGVja291 dF9yb290LAogICAgICAgICAgICAgInNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtIjogIk1P Q0s6IHVwZGF0ZV9zdGF0dXM6IHJpZXR2ZWxkLXVwbG9hZC1xdWV1ZSBVcGxvYWRpbmcgcGF0Y2hc biIsCiAgICAgICAgICAgICAicHJvY2Vzc193b3JrX2l0ZW0iOiAiTU9DSzogdXBkYXRlX3N0YXR1 czogcmlldHZlbGQtdXBsb2FkLXF1ZXVlIFBhc3NcbiIsCi0gICAgICAgICAgICAiaGFuZGxlX3Vu ZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0aW5nIGZsYWcgJ2luLXJpZXR2ZWxkJyB0byAnLScg b24gYXR0YWNobWVudCAnMTIzNCcgd2l0aCBjb21tZW50ICdDb3VsZCBub3QgdXBsb2FkIHBhdGNo IDEyMzQgdG8gcmlldHZlbGQuIFJpZXR2ZWxkIGlzIGRvd24gb3IgdGhlcmUncyBhIGJ1ZyBpbiB0 aGUgdXBsb2FkIGJvdC4nIGFuZCBhZGRpdGlvbmFsIGNvbW1lbnQgJ01vY2sgZXJyb3IgbWVzc2Fn ZSdcbiIsCisgICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9DSyBzZXR0 aW5nIGZsYWcgJ2luLXJpZXR2ZWxkJyB0byAnLScgb24gYXR0YWNobWVudCAnMTIzNCcgd2l0aCBj b21tZW50ICdOb25lJyBhbmQgYWRkaXRpb25hbCBjb21tZW50ICdOb25lJ1xuIiwKICAgICAgICAg fQogICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRzKFJpZXR2ZWxkVXBsb2FkUXVldWUo KSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3N0ZXBzZXF1ZW5jZS5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9zdGVwc2VxdWVuY2UucHkK aW5kZXggNjM3MDY4ZTg5ODg1NTY4NmJkYThkZTQ2MTk4NTBlMjYzMmE1NGE3OC4uYzZkZTc5ZjBm NzM1NzAyOWVmMWVhZDg3MjgxMmI3OTU4ZTJkZmJhZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3N0ZXBzZXF1ZW5jZS5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc3RlcHNlcXVlbmNlLnB5CkBA IC0zNSwxNyArMzUsNiBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZGVwcmVjYXRlZF9s b2dnaW5nIGltcG9ydCBsb2cKIAogCiBjbGFzcyBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIoKToK LSAgICAjIEZJWE1FOiBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIgaXMganVzdCBhbiBpbnRlcmZh Y2UgZGVmaW5pdGlvbi4KLSAgICAjIEl0IHNob3VsZG4ndCBoYXZlIGFueSBpbXBsZW1lbnRhdGlv bnMuCi0gICAgIyBDcmVhdGUgYW4gaW50ZXJtZWRpYXRlIGNsYXNzIHRoYXQgaW5oZXJpdHMgZnJv bSBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIKLSAgICAjIHRoYXQgdGhlIGFwcHJvcHJpYXRlIHF1 ZXVlcyBpbmhlcml0IGZyb20uCi0gICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBfZXJyb3JfbWVz c2FnZV9mb3JfYnVnKHRvb2wsIHN0YXR1c19pZCwgc2NyaXB0X2Vycm9yKToKLSAgICAgICAgaWYg bm90IHNjcmlwdF9lcnJvci5vdXRwdXQ6Ci0gICAgICAgICAgICByZXR1cm4gc2NyaXB0X2Vycm9y Lm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKQotICAgICAgICByZXN1bHRzX2xpbmsgPSB0b29sLnN0YXR1 c19zZXJ2ZXIucmVzdWx0c191cmxfZm9yX3N0YXR1cyhzdGF0dXNfaWQpCi0gICAgICAgIHJldHVy biAiJXNcbkZ1bGwgb3V0cHV0OiAlcyIgJSAoc2NyaXB0X2Vycm9yLm1lc3NhZ2Vfd2l0aF9vdXRw dXQoKSwgcmVzdWx0c19saW5rKQotCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGhhbmRsZV9z Y3JpcHRfZXJyb3IoY2xzLCB0b29sLCBwYXRjaCwgc2NyaXB0X2Vycm9yKToKICAgICAgICAgcmFp c2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKaW5kZXggZTA0ZWJl ZDY0NzI5Yzk2ODRkMzM4NDY5ODM0M2I3NDAwNDE2MTU4MS4uYmVmMWE2OWE2ZGU2OWRiMjVhNTk5 MGY1NjkzN2M4YzkwZjE2ZGZkNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL21vY2t0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9tb2NrdG9vbC5weQpAQCAtMjI1LDggKzIyNSwxMiBAQCBjbGFzcyBNb2NrQnVnemlsbGFR dWVyaWVzKE1vY2spOgogICAgIGRlZiBmZXRjaF9wYXRjaGVzX2Zyb21fcGVuZGluZ19jb21taXRf bGlzdChzZWxmKToKICAgICAgICAgcmV0dXJuIHN1bShbYnVnLnJldmlld2VkX3BhdGNoZXMoKSBm b3IgYnVnIGluIHNlbGYuX2FsbF9idWdzKCldLCBbXSkKIAotICAgIGRlZiBmZXRjaF9wYXRjaGVz X2Zyb21fcmlldHZlbGRfcXVldWUoc2VsZik6Ci0gICAgICAgIHJldHVybiBzdW0oW2J1Zy5pbl9y aWV0dmVsZF9xdWV1ZV9wYXRjaGVzKCkgZm9yIGJ1ZyBpbiBzZWxmLl9hbGxfYnVncygpXSwgW10p CisgICAgZGVmIGZldGNoX2ZpcnN0X3BhdGNoX2Zyb21fcmlldHZlbGRfcXVldWUoc2VsZik6Cisg ICAgICAgIGZvciBidWcgaW4gc2VsZi5fYWxsX2J1Z3MoKToKKyAgICAgICAgICAgIHBhdGNoZXMg PSBidWcuaW5fcmlldHZlbGRfcXVldWVfcGF0Y2hlcygpCisgICAgICAgICAgICBpZiBsZW4ocGF0 Y2hlcyk6CisgICAgICAgICAgICAgICAgcmV0dXJuIHBhdGNoZXNbMF0KKyAgICAgICAgcmFpc2Ug RXhjZXB0aW9uKCdObyBwYXRjaGVzIGluIHRoZSByaWV0dmVsZCBxdWV1ZScpCiAKICMgRklYTUU6 IEJ1Z3ppbGxhIGlzIHRoZSB3cm9uZyBNb2NrLXBvaW50LiAgT25jZSB3ZSBoYXZlIGEgQnVnemls bGFOZXR3b3JrCiAjICAgICAgICBjbGFzcyB3ZSBzaG91bGQgbW9jayB0aGF0IGluc3RlYWQuCg==