76585 2012-01-18 15:57:09 -0800 [GTK] ensure the jhbuild used by webkit is as up-to-date as needed 2012-01-19 18:45:35 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gustavo gustavo gustavo mrobinson xan.lopez oldest_to_newest 538290 0 gustavo 2012-01-18 15:57:09 -0800 [GTK] ensure the jhbuild used by webkit is as up-to-date as needed 538292 1 123029 gustavo 2012-01-18 15:59:14 -0800 Created attachment 123029 Patch 538362 2 123029 mrobinson 2012-01-18 17:51:34 -0800 Comment on attachment 123029 Patch Won't this break if we bump jhbuild_revision after someone has already called update-webkitgtk-libs? 538431 3 123029 gustavo 2012-01-18 20:42:03 -0800 Comment on attachment 123029 Patch Attachment 123029 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11196981 538587 4 123094 gustavo 2012-01-19 03:21:53 -0800 Created attachment 123094 Patch 538590 5 gustavo 2012-01-19 03:29:47 -0800 Somehow a bad revision hash (it's actually from soup!) sneaked into the patch, I wonder how. This new one should work =) 538602 6 123094 gustavo 2012-01-19 03:51:48 -0800 Comment on attachment 123094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123094&action=review > Tools/gtk/run-with-jhbuild:23 > +jhbuild_revision = '1eedc423f75c605224b430579e4c303292199507' (In reply to comment #2) > (From update of attachment 123029 [details]) > Won't this break if we bump jhbuild_revision after someone has already called update-webkitgtk-libs? It won't, my main concern when writing this patch was actually to bring existing jhbuild checkouts up-to-date, for cases like the one we had recently, where we required a bug fix, so we don't need to manually update it. Here's how it works: > Tools/gtk/run-with-jhbuild:83 > + process = subprocess.Popen(['git', 'rev-list', 'HEAD^..'], cwd=jhbuild_source_path, > + stdout=subprocess.PIPE, stderr=subprocess.PIPE) This code is here to check that we have the desired revision - this is the code path we'll hit when jhbuild is already cloned/installed. Then it calls install_and_run_jhbuild(), where this change makes it do the right thing: > Tools/gtk/run-with-jhbuild:44 > + else: > + process = subprocess.Popen(['git', 'remote', 'update', 'origin'], cwd=source_path) > + process.wait() > + if process.returncode != 0: > + raise Exception('jhbuild remote update origin failed with return code: %i' % process.returncode) This else block is the code path we'll hit in this case as well - it will run git remote update origin to fetch the new data from the repository, = so that the checkout that follows is able to checkout the revision =) 538755 7 123094 mrobinson 2012-01-19 09:17:26 -0800 Comment on attachment 123094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123094&action=review >> Tools/gtk/run-with-jhbuild:83 >> + stdout=subprocess.PIPE, stderr=subprocess.PIPE) > > This code is here to check that we have the desired revision - this is the code path we'll hit when jhbuild is already cloned/installed. Then it calls install_and_run_jhbuild(), where this change makes it do the right thing: Ah, I get it now! I would suggest a small refactor. Make a helper function called install_or_update_jhbuild that does the outer check and then move this code and the code above to a helper function called "update_jhbuild." This patch has the unintended consequence of updating jhbuild modules even when the user didn't request it. 538841 8 123155 gustavo 2012-01-19 11:22:51 -0800 Created attachment 123155 Patch 538847 9 123155 mrobinson 2012-01-19 11:27:51 -0800 Comment on attachment 123155 Patch Thanks! 539228 10 123155 gustavo 2012-01-19 18:45:27 -0800 Comment on attachment 123155 Patch Clearing flags on attachment: 123155 Committed r105472: <http://trac.webkit.org/changeset/105472> 539229 11 gustavo 2012-01-19 18:45:35 -0800 All reviewed patches have been landed. Closing bug. 123029 2012-01-18 15:59:14 -0800 2012-01-19 03:21:44 -0800 Patch bug-76585-20120118215829.patch text/plain 3497 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MzMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjEzZmQ0NjBlZDljMmM4YjRiNjQzMTNjMmY0Yjg0ZjZh NGMzNWRiZi4uY2ZlYTczODhiMzNkYWJlYjE3NGQwOWQwZjQ2MzU3ZjdhNTFiNmQ0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTAxLTE4ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIFtHVEtdIGVuc3VyZSB0aGUgamhidWlsZCB1c2VkIGJ5IHdlYmtpdCBpcyBhcyB1 cC10by1kYXRlIGFzIG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzY1ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIGFsbG93cyB1cyB0byBzcGVjaWZ5IGEgbWluaW11bSB2ZXJzaW9uIG9m IGpoYnVpbGQgcmVxdWlyZWQsCisgICAgICAgIHdoaWxlIGFsc28gcHJvdmlkaW5nIHN0YWJpbGl0 eSBhZ2FpbnN0IGNoYW5nZXMgZG9uZSB0byB0aGUgbWFzdGVyCisgICAgICAgIGJyYW5jaCwgYnkg bGV0dGluZyB1cyBjaG9vc2Ugd2hhdCBpcyB0aGUgZXhhY3QgdmVyc2lvbiB0aGF0IHdpbGwKKyAg ICAgICAgYmUgdXNlZC4KKworICAgICAgICAqIGd0ay9ydW4td2l0aC1qaGJ1aWxkOgorICAgICAg ICAoaW5zdGFsbF9hbmRfcnVuX2poYnVpbGQpOiBub3cgYWxzbyBjYWxsZWQgd2hlbiB0aGUgZXhp c3RpbmcKKyAgICAgICAgY2hlY2tvdXQgaXMgbm90IHRoZSByZXF1aXJlZCB2ZXJzaW9uLCB0byBi cmluZyBpdCB1cC10by1kYXRlCisKIDIwMTItMDEtMTggIE9qYW4gVmFmYWkgIDxvamFuQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBTaGF2ZSAwLjUgc2Vjb25kcyBvZmYgY2hlY2std2Via2l0LXN0 eWxlIHJ1bnRpbWUgZm9yIHRlc3RfZXhwZWN0YXRpb25zLnR4dApkaWZmIC0tZ2l0IGEvVG9vbHMv Z3RrL3J1bi13aXRoLWpoYnVpbGQgYi9Ub29scy9ndGsvcnVuLXdpdGgtamhidWlsZAppbmRleCA5 ZGM2ZmZkMTBiZmRjMGI1OTllNTVhMzM3M2RhZjZhNDAwN2U1NTIyLi4wNDk2ZWI1ODExYTZjZWZi MzQ2NGMwY2FjYTZlMmVhZWMzNDZkNTk4IDEwMDc1NQotLS0gYS9Ub29scy9ndGsvcnVuLXdpdGgt amhidWlsZAorKysgYi9Ub29scy9ndGsvcnVuLXdpdGgtamhidWlsZApAQCAtMjAsNiArMjAsOCBA QCBpbXBvcnQgb3MKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKK2poYnVpbGRfcmV2 aXNpb24gPSAnNTQwN2NjNTNlM2VjMDJhN2Y0MjUxYWU3NzViNDgyM2JmOTY3MmY4NicKKwogZGVm IGluc3RhbGxfYW5kX3J1bl9qaGJ1aWxkKCk6CiAgICAgaW5zdGFsbGF0aW9uX3ByZWZpeCA9IG9z LnBhdGguYWJzcGF0aChjb21tb24udG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVu ZGVuY2llcycsICdSb290JykpCiAgICAgc291cmNlX3BhdGggPSBvcy5wYXRoLmFic3BhdGgoY29t bW9uLnRvcF9sZXZlbF9wYXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnLCAnU291cmNl JykpCkBAIC0zNSw2ICszNywxNyBAQCBkZWYgaW5zdGFsbF9hbmRfcnVuX2poYnVpbGQoKToKICAg ICAgICAgcHJvY2Vzcy53YWl0KCkKICAgICAgICAgaWYgcHJvY2Vzcy5yZXR1cm5jb2RlICE9IDA6 CiAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ2poYnVpbGQgZ2l0IGNsb25lIGZhaWxlZCB3 aXRoIHJldHVybiBjb2RlOiAlaScgJSBwcm9jZXNzLnJldHVybmNvZGUpCisgICAgZWxzZToKKyAg ICAgICAgcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oWydnaXQnLCAncmVtb3RlJywgJ3VwZGF0 ZScsICdvcmlnaW4nXSwgY3dkPXNvdXJjZV9wYXRoKQorICAgICAgICBwcm9jZXNzLndhaXQoKQor ICAgICAgICBpZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKKyAgICAgICAgICAgIHJhaXNlIEV4 Y2VwdGlvbignamhidWlsZCByZW1vdGUgdXBkYXRlIG9yaWdpbiBmYWlsZWQgd2l0aCByZXR1cm4g Y29kZTogJWknICUgcHJvY2Vzcy5yZXR1cm5jb2RlKQorCisgICAgcHJvY2VzcyA9IHN1YnByb2Nl c3MuUG9wZW4oWydnaXQnLCAnY2hlY2tvdXQnLCAnJXMnICUgamhidWlsZF9yZXZpc2lvbl0sCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWpoYnVpbGRfc291cmNlX3BhdGgpCisg ICAgcHJvY2Vzcy53YWl0KCkKKyAgICBpZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKKyAgICAg ICAgcmFpc2UgRXhjZXB0aW9uKCdmYWlsZWQgdG8gY2hlY2tvdXQgdHJlZWlzaCAlczogJWknICUg KGpoYnVpbGRfcmV2aXNpb24sIHByb2Nlc3MucmV0dXJuY29kZSkpCiAKICAgICAjIGpoYnVpbGQg aXMgcmVhbGx5IHVuaGFwcHkgYWJvdXQgaGF2aW5nIE1BS0UgZGVmaW5lZCB0byBzb21ldGhpbmcg bGlrZSAnbWFrZSAtajQnCiAgICAgIyBzbyB3ZSBqdXN0IHVuZGVmaW5lIGl0IGhlcmUuCkBAIC02 MSw2ICs3NCwxOSBAQCBkZWYgaW5zdGFsbF9hbmRfcnVuX2poYnVpbGQoKToKIGpoYnVpbGRfcGF0 aCA9IGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJywg J1Jvb3QnLCAnYmluJywgJ2poYnVpbGQnKQogaWYgbm90IG9zLnBhdGguZXhpc3RzKGpoYnVpbGRf cGF0aCk6CiAgICAgaW5zdGFsbF9hbmRfcnVuX2poYnVpbGQoKQorZWxzZToKKyAgICBzb3VyY2Vf cGF0aCA9IG9zLnBhdGguYWJzcGF0aChjb21tb24udG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1aWxk JywgJ0RlcGVuZGVuY2llcycsICdTb3VyY2UnKSkKKyAgICBqaGJ1aWxkX3NvdXJjZV9wYXRoID0g b3MucGF0aC5qb2luKHNvdXJjZV9wYXRoLCAnamhidWlsZCcpCisKKyAgICAjIENoZWNrIHRoYXQg d2UgaGF2ZSB0aGUgZGVzaXJlZCBqaGJ1aWxkIHJldmlzaW9uCisgICAgcHJvY2VzcyA9IHN1YnBy b2Nlc3MuUG9wZW4oWydnaXQnLCAncmV2LWxpc3QnLCAnSEVBRF4uLiddLCBjd2Q9amhidWlsZF9z b3VyY2VfcGF0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9c3VicHJv Y2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQorICAgIG91dHB1dCwgZXJyID0gcHJv Y2Vzcy5jb21tdW5pY2F0ZSgpCisgICAgaWYgcHJvY2Vzcy5yZXR1cm5jb2RlICE9IDA6CisgICAg ICAgIHJhaXNlIEV4Y2VwdGlvbignZmFpbGVkIHRvIGZpbmQgamhidWlsZCByZXZpc2lvbjogJXMn ICUgZXJyKQorCisgICAgaWYgb3V0cHV0LnN0cmlwKCkgIT0gamhidWlsZF9yZXZpc2lvbjoKKyAg ICAgICAgaW5zdGFsbF9hbmRfcnVuX2poYnVpbGQoKQogCiBwcm9jZXNzID0gc3VicHJvY2Vzcy5Q b3BlbihbamhidWlsZF9wYXRoLCAnLS1uby1pbnRlcmFjdCcsICctZicsIGNvbW1vbi50b3BfbGV2 ZWxfcGF0aCgnVG9vbHMnLCAnZ3RrJywgJ2poYnVpbGRyYycpLCAncnVuJ10gKyBzeXMuYXJndlsx Ol0pCiBwcm9jZXNzLndhaXQoKQo= 123094 2012-01-19 03:21:53 -0800 2012-01-19 11:22:45 -0800 Patch bug-76585-20120119092106.patch text/plain 3513 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1Mzk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2I0MzkwYjBiZmE2MjM2MjFlOTA1OGY0NTVmOGZlYzg5 MWFiYmY0Mi4uYmFlYjljYTI4YWE3NGViNGEwODNkMzQ3N2JiNGQ3Zjg3OGUzMTcwYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTAxLTE5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIFtHVEtdIGVuc3VyZSB0aGUgamhidWlsZCB1c2VkIGJ5IHdlYmtpdCBpcyBhcyB1 cC10by1kYXRlIGFzIG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzY1ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIGFsbG93cyB1cyB0byBzcGVjaWZ5IGEgbWluaW11bSB2ZXJzaW9uIG9m IGpoYnVpbGQgcmVxdWlyZWQsCisgICAgICAgIHdoaWxlIGFsc28gcHJvdmlkaW5nIHN0YWJpbGl0 eSBhZ2FpbnN0IGNoYW5nZXMgZG9uZSB0byB0aGUgbWFzdGVyCisgICAgICAgIGJyYW5jaCwgYnkg bGV0dGluZyB1cyBjaG9vc2Ugd2hhdCBpcyB0aGUgZXhhY3QgdmVyc2lvbiB0aGF0IHdpbGwKKyAg ICAgICAgYmUgdXNlZC4KKworICAgICAgICAqIGd0ay9ydW4td2l0aC1qaGJ1aWxkOgorICAgICAg ICAoaW5zdGFsbF9hbmRfcnVuX2poYnVpbGQpOiBub3cgYWxzbyBjYWxsZWQgd2hlbiB0aGUgZXhp c3RpbmcKKyAgICAgICAgY2hlY2tvdXQgaXMgbm90IHRoZSByZXF1aXJlZCB2ZXJzaW9uLCB0byBi cmluZyBpdCB1cC10by1kYXRlCisKIDIwMTItMDEtMTkgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3Iu YXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gTWFrZSBidWlsZC13ZWJraXQg YWx3YXlzIGRvIHNhZmUgaW5jcmVtZW50YWwgYnVpbGRzIGFmdGVyIHVwZGF0ZS13ZWJraXQKZGlm ZiAtLWdpdCBhL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkIGIvVG9vbHMvZ3RrL3J1bi13aXRo LWpoYnVpbGQKaW5kZXggOWRjNmZmZDEwYmZkYzBiNTk5ZTU1YTMzNzNkYWY2YTQwMDdlNTUyMi4u N2YwNzk4ZGUxYmYwYTg3NGE0OGI1NWNlOWUyNzZlOTRkOTcyYmE0NCAxMDA3NTUKLS0tIGEvVG9v bHMvZ3RrL3J1bi13aXRoLWpoYnVpbGQKKysrIGIvVG9vbHMvZ3RrL3J1bi13aXRoLWpoYnVpbGQK QEAgLTIwLDYgKzIwLDggQEAgaW1wb3J0IG9zCiBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5 cwogCitqaGJ1aWxkX3JldmlzaW9uID0gJzFlZWRjNDIzZjc1YzYwNTIyNGI0MzA1NzllNGMzMDMy OTIxOTk1MDcnCisKIGRlZiBpbnN0YWxsX2FuZF9ydW5famhidWlsZCgpOgogICAgIGluc3RhbGxh dGlvbl9wcmVmaXggPSBvcy5wYXRoLmFic3BhdGgoY29tbW9uLnRvcF9sZXZlbF9wYXRoKCdXZWJL aXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnLCAnUm9vdCcpKQogICAgIHNvdXJjZV9wYXRoID0gb3Mu cGF0aC5hYnNwYXRoKGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5k ZW5jaWVzJywgJ1NvdXJjZScpKQpAQCAtMzUsNiArMzcsMTcgQEAgZGVmIGluc3RhbGxfYW5kX3J1 bl9qaGJ1aWxkKCk6CiAgICAgICAgIHByb2Nlc3Mud2FpdCgpCiAgICAgICAgIGlmIHByb2Nlc3Mu cmV0dXJuY29kZSAhPSAwOgogICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdqaGJ1aWxkIGdp dCBjbG9uZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUgcHJvY2Vzcy5yZXR1cm5jb2Rl KQorICAgIGVsc2U6CisgICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsnZ2l0Jywg J3JlbW90ZScsICd1cGRhdGUnLCAnb3JpZ2luJ10sIGN3ZD1zb3VyY2VfcGF0aCkKKyAgICAgICAg cHJvY2Vzcy53YWl0KCkKKyAgICAgICAgaWYgcHJvY2Vzcy5yZXR1cm5jb2RlICE9IDA6CisgICAg ICAgICAgICByYWlzZSBFeGNlcHRpb24oJ2poYnVpbGQgcmVtb3RlIHVwZGF0ZSBvcmlnaW4gZmFp bGVkIHdpdGggcmV0dXJuIGNvZGU6ICVpJyAlIHByb2Nlc3MucmV0dXJuY29kZSkKKworICAgIHBy b2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsnZ2l0JywgJ2NoZWNrb3V0JywgJyVzJyAlIGpoYnVp bGRfcmV2aXNpb25dLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN3ZD1qaGJ1aWxk X3NvdXJjZV9wYXRoKQorICAgIHByb2Nlc3Mud2FpdCgpCisgICAgaWYgcHJvY2Vzcy5yZXR1cm5j b2RlICE9IDA6CisgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignZmFpbGVkIHRvIGNoZWNrb3V0IHRy ZWVpc2ggJXM6ICVpJyAlIChqaGJ1aWxkX3JldmlzaW9uLCBwcm9jZXNzLnJldHVybmNvZGUpKQog CiAgICAgIyBqaGJ1aWxkIGlzIHJlYWxseSB1bmhhcHB5IGFib3V0IGhhdmluZyBNQUtFIGRlZmlu ZWQgdG8gc29tZXRoaW5nIGxpa2UgJ21ha2UgLWo0JwogICAgICMgc28gd2UganVzdCB1bmRlZmlu ZSBpdCBoZXJlLgpAQCAtNjEsNiArNzQsMTkgQEAgZGVmIGluc3RhbGxfYW5kX3J1bl9qaGJ1aWxk KCk6CiBqaGJ1aWxkX3BhdGggPSBjb21tb24udG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1aWxkJywg J0RlcGVuZGVuY2llcycsICdSb290JywgJ2JpbicsICdqaGJ1aWxkJykKIGlmIG5vdCBvcy5wYXRo LmV4aXN0cyhqaGJ1aWxkX3BhdGgpOgogICAgIGluc3RhbGxfYW5kX3J1bl9qaGJ1aWxkKCkKK2Vs c2U6CisgICAgc291cmNlX3BhdGggPSBvcy5wYXRoLmFic3BhdGgoY29tbW9uLnRvcF9sZXZlbF9w YXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnLCAnU291cmNlJykpCisgICAgamhidWls ZF9zb3VyY2VfcGF0aCA9IG9zLnBhdGguam9pbihzb3VyY2VfcGF0aCwgJ2poYnVpbGQnKQorCisg ICAgIyBDaGVjayB0aGF0IHdlIGhhdmUgdGhlIGRlc2lyZWQgamhidWlsZCByZXZpc2lvbgorICAg IHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsnZ2l0JywgJ3Jldi1saXN0JywgJ0hFQUReLi4n XSwgY3dkPWpoYnVpbGRfc291cmNlX3BhdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJyPXN1YnByb2Nlc3MuUElQRSkKKyAgICBv dXRwdXQsIGVyciA9IHByb2Nlc3MuY29tbXVuaWNhdGUoKQorICAgIGlmIHByb2Nlc3MucmV0dXJu Y29kZSAhPSAwOgorICAgICAgICByYWlzZSBFeGNlcHRpb24oJ2ZhaWxlZCB0byBmaW5kIGpoYnVp bGQgcmV2aXNpb246ICVzJyAlIGVycikKKworICAgIGlmIG91dHB1dC5zdHJpcCgpICE9IGpoYnVp bGRfcmV2aXNpb246CisgICAgICAgIGluc3RhbGxfYW5kX3J1bl9qaGJ1aWxkKCkKIAogcHJvY2Vz cyA9IHN1YnByb2Nlc3MuUG9wZW4oW2poYnVpbGRfcGF0aCwgJy0tbm8taW50ZXJhY3QnLCAnLWYn LCBjb21tb24udG9wX2xldmVsX3BhdGgoJ1Rvb2xzJywgJ2d0aycsICdqaGJ1aWxkcmMnKSwgJ3J1 biddICsgc3lzLmFyZ3ZbMTpdKQogcHJvY2Vzcy53YWl0KCkK 123155 2012-01-19 11:22:51 -0800 2012-01-19 18:45:27 -0800 Patch bug-76585-20120119172204.patch text/plain 5977 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NDI0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDdiNmIzNzgxZDc2NWMxY2M1YWEwZTRkNWQzZWZlNDE1 MjEyMzg4ZS4uMDM2ZGNkZTk5N2QwZWFmMWM3MjAwYjdiN2FlNWMxZjMxNjAwYTdiYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTAxLTE5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIFtHVEtdIGVuc3VyZSB0aGUgamhidWlsZCB1c2VkIGJ5IHdlYmtpdCBpcyBhcyB1 cC10by1kYXRlIGFzIG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzY1ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIGFsbG93cyB1cyB0byBzcGVjaWZ5IGEgbWluaW11bSB2ZXJzaW9uIG9m IGpoYnVpbGQgcmVxdWlyZWQsCisgICAgICAgIHdoaWxlIGFsc28gcHJvdmlkaW5nIHN0YWJpbGl0 eSBhZ2FpbnN0IGNoYW5nZXMgZG9uZSB0byB0aGUgbWFzdGVyCisgICAgICAgIGJyYW5jaCwgYnkg bGV0dGluZyB1cyBjaG9vc2Ugd2hhdCBpcyB0aGUgZXhhY3QgdmVyc2lvbiB0aGF0IHdpbGwKKyAg ICAgICAgYmUgdXNlZC4KKworICAgICAgICAqIGd0ay9ydW4td2l0aC1qaGJ1aWxkOiByZWZhY3Rv cmVkIGZvciBtb3JlIGhhY2thYmlsaXR5IGFuZCBlYXNpZXIKKyAgICAgICAgcmVhZGluZworICAg ICAgICAoamhidWlsZF9pbnN0YWxsZWQpOiBjaGVja3Mgd2hldGhlciBqaGJ1aWxkIGlzIGluc3Rh bGxlZAorICAgICAgICAoamhidWlsZF9jbG9uZWQpOiBjaGVja3Mgd2hldGhlciBqaGJ1aWxkIGhh cyBiZWVuIGNsb25lZAorICAgICAgICAoamhidWlsZF9hdF9leHBlY3RlZF9yZXZpc2lvbik6IGNo ZWNrcyB3aGV0aGVyIGpoYnVpbGQgaXMgYXQgdGhlCisgICAgICAgIGV4cGVjdGVkIHJldmlzaW9u CisgICAgICAgICh1cGRhdGVfamhidWlsZCk6IGJyaW5ncyBqaGJ1aWxkIHRvIHRoZSBleHBlY3Rl ZCByZXZpc2lvbgorICAgICAgICAoY2xvbmVfamhidWlsZCk6IGNsb25lcyBqaGJ1aWxkCisgICAg ICAgIChpbnN0YWxsX2poYnVpbGQpOiBidWlsZCBhbmQgaW5zdGFsbHMgamhidWlsZAorICAgICAg ICAodXBkYXRlX3dlYmtpdGd0a19saWJzKTogcnVucyB1cGRhdGUtd2Via2l0Z3RrLWxpYnMKKyAg ICAgICAgKGVuc3VyZV9qaGJ1aWxkKTogaGlnaC1sZXZlbCBsb2dpYyB0byBkZWNpZGUgd2hldGhl ciBhbmQgd2hpY2ggb2YKKyAgICAgICAgdGhlIHN0ZXBzIGFib3ZlIGFyZSBleGVjdXRlZAorCiAy MDEyLTAxLTE4ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAg ZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmdGcm9tUmFuZ2UgaW4gV2ViSFRNTENvbnZlcnRlciBkb2Vz IG5vdCBoYW5kbGUgTlNVbmRlcmxpbmVTdHlsZUF0dHJpYnV0ZU5hbWUuCmRpZmYgLS1naXQgYS9U b29scy9ndGsvcnVuLXdpdGgtamhidWlsZCBiL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCmlu ZGV4IDlkYzZmZmQxMGJmZGMwYjU5OWU1NWEzMzczZGFmNmE0MDA3ZTU1MjIuLjNjZTQ4YzUwZTgw NzNkZmIyZmRjYWZiNGRiZDc1NDIzYWRjNTRhNjQgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0ay9ydW4t d2l0aC1qaGJ1aWxkCisrKyBiL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCkBAIC0xLDUgKzEs NiBAQAogIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCiAjIENvcHlyaWdodCAoQykgMjAxMSBJZ2FsaWEg Uy5MLgorIyBDb3B5cmlnaHQgKEMpIDIwMTIgR3VzdGF2byBOb3JvbmhhIFNpbHZhIDxnbnNAZ25v bWUub3JnPgogIwogIyBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRp c3RyaWJ1dGUgaXQgYW5kL29yCiAjIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdO VSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAgLTIwLDIyICsyMSw1OSBAQCBpbXBvcnQgb3MKIGlt cG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLWRlZiBpbnN0YWxsX2FuZF9ydW5famhidWls ZCgpOgotICAgIGluc3RhbGxhdGlvbl9wcmVmaXggPSBvcy5wYXRoLmFic3BhdGgoY29tbW9uLnRv cF9sZXZlbF9wYXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnLCAnUm9vdCcpKQotICAg IHNvdXJjZV9wYXRoID0gb3MucGF0aC5hYnNwYXRoKGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnV2Vi S2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJywgJ1NvdXJjZScpKQotICAgIGpoYnVpbGRfc291cmNl X3BhdGggPSBvcy5wYXRoLmpvaW4oc291cmNlX3BhdGgsICdqaGJ1aWxkJykKIAoramhidWlsZF9y ZXZpc2lvbiA9ICcxZWVkYzQyM2Y3NWM2MDUyMjRiNDMwNTc5ZTRjMzAzMjkyMTk5NTA3JworCitp bnN0YWxsYXRpb25fcHJlZml4ID0gb3MucGF0aC5hYnNwYXRoKGNvbW1vbi50b3BfbGV2ZWxfcGF0 aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJywgJ1Jvb3QnKSkKK3NvdXJjZV9wYXRoID0g b3MucGF0aC5hYnNwYXRoKGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVw ZW5kZW5jaWVzJywgJ1NvdXJjZScpKQoramhidWlsZF9zb3VyY2VfcGF0aCA9IG9zLnBhdGguam9p bihzb3VyY2VfcGF0aCwgJ2poYnVpbGQnKQoramhidWlsZF9wYXRoID0gY29tbW9uLnRvcF9sZXZl bF9wYXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnLCAnUm9vdCcsICdiaW4nLCAnamhi dWlsZCcpCisKKworZGVmIGpoYnVpbGRfaW5zdGFsbGVkKCk6CisgICAgcmV0dXJuIG9zLnBhdGgu ZXhpc3RzKGpoYnVpbGRfcGF0aCkKKworCitkZWYgamhidWlsZF9jbG9uZWQoKToKKyAgICByZXR1 cm4gb3MucGF0aC5leGlzdHMoamhidWlsZF9zb3VyY2VfcGF0aCkKKworCitkZWYgamhidWlsZF9h dF9leHBlY3RlZF9yZXZpc2lvbigpOgorICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsn Z2l0JywgJ3Jldi1saXN0JywgJ0hFQUReLi4nXSwgY3dkPWpoYnVpbGRfc291cmNlX3BhdGgsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc3Rk ZXJyPXN1YnByb2Nlc3MuUElQRSkKKyAgICBvdXRwdXQsIGVyciA9IHByb2Nlc3MuY29tbXVuaWNh dGUoKQorICAgIGlmIHByb2Nlc3MucmV0dXJuY29kZSAhPSAwOgorICAgICAgICByYWlzZSBFeGNl cHRpb24oJ2ZhaWxlZCB0byBmaW5kIGpoYnVpbGQgcmV2aXNpb246ICVzJyAlIGVycikKKworICAg IHJldHVybiBvdXRwdXQuc3RyaXAoKSA9PSBqaGJ1aWxkX3JldmlzaW9uCisKKworZGVmIHVwZGF0 ZV9qaGJ1aWxkKCk6CisgICAgcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oWydnaXQnLCAncmVt b3RlJywgJ3VwZGF0ZScsICdvcmlnaW4nXSwgY3dkPXNvdXJjZV9wYXRoKQorICAgIHByb2Nlc3Mu d2FpdCgpCisgICAgaWYgcHJvY2Vzcy5yZXR1cm5jb2RlICE9IDA6CisgICAgICAgIHJhaXNlIEV4 Y2VwdGlvbignamhidWlsZCByZW1vdGUgdXBkYXRlIG9yaWdpbiBmYWlsZWQgd2l0aCByZXR1cm4g Y29kZTogJWknICUgcHJvY2Vzcy5yZXR1cm5jb2RlKQorCisgICAgcHJvY2VzcyA9IHN1YnByb2Nl c3MuUG9wZW4oWydnaXQnLCAnY2hlY2tvdXQnLCAnJXMnICUgamhidWlsZF9yZXZpc2lvbl0sCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWpoYnVpbGRfc291cmNlX3BhdGgpCisg ICAgcHJvY2Vzcy53YWl0KCkKKyAgICBpZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKKyAgICAg ICAgcmFpc2UgRXhjZXB0aW9uKCdmYWlsZWQgdG8gY2hlY2tvdXQgdHJlZWlzaCAlczogJWknICUg KGpoYnVpbGRfcmV2aXNpb24sIHByb2Nlc3MucmV0dXJuY29kZSkpCisKKworZGVmIGNsb25lX2po YnVpbGQoKToKICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoc291cmNlX3BhdGgpOgogICAgICAg ICBvcy5tYWtlZGlycyhzb3VyY2VfcGF0aCkKICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoaW5z dGFsbGF0aW9uX3ByZWZpeCk6CiAgICAgICAgIG9zLm1ha2VkaXJzKGluc3RhbGxhdGlvbl9wcmVm aXgpCiAKLSAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoamhidWlsZF9zb3VyY2VfcGF0aCk6Ci0g ICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsnZ2l0JywgJ2Nsb25lJywgJ2dpdDov L2dpdC5nbm9tZS5vcmcvamhidWlsZCddLCBjd2Q9c291cmNlX3BhdGgpCi0gICAgICAgIHByb2Nl c3Mud2FpdCgpCi0gICAgICAgIGlmIHByb2Nlc3MucmV0dXJuY29kZSAhPSAwOgotICAgICAgICAg ICAgcmFpc2UgRXhjZXB0aW9uKCdqaGJ1aWxkIGdpdCBjbG9uZSBmYWlsZWQgd2l0aCByZXR1cm4g Y29kZTogJWknICUgcHJvY2Vzcy5yZXR1cm5jb2RlKQorICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNz LlBvcGVuKFsnZ2l0JywgJ2Nsb25lJywgJ2dpdDovL2dpdC5nbm9tZS5vcmcvamhidWlsZCddLCBj d2Q9c291cmNlX3BhdGgpCisgICAgcHJvY2Vzcy53YWl0KCkKKyAgICBpZiBwcm9jZXNzLnJldHVy bmNvZGUgIT0gMDoKKyAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdqaGJ1aWxkIGdpdCBjbG9uZSBm YWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUgcHJvY2Vzcy5yZXR1cm5jb2RlKQorCiAKK2Rl ZiBpbnN0YWxsX2poYnVpbGQoKToKICAgICAjIGpoYnVpbGQgaXMgcmVhbGx5IHVuaGFwcHkgYWJv dXQgaGF2aW5nIE1BS0UgZGVmaW5lZCB0byBzb21ldGhpbmcgbGlrZSAnbWFrZSAtajQnCiAgICAg IyBzbyB3ZSBqdXN0IHVuZGVmaW5lIGl0IGhlcmUuCiAgICAgZW52X3dpdGhvdXRfbWFrZSA9IGRp Y3Qob3MuZW52aXJvbikKQEAgLTUzLDE0ICs5MSwyOCBAQCBkZWYgaW5zdGFsbF9hbmRfcnVuX2po YnVpbGQoKToKICAgICBpZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKICAgICAgICAgcmFpc2Ug RXhjZXB0aW9uKCdqaGJ1aWxkIGNvbmZpZ3VyZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWkn ICUgcHJvY2Vzcy5yZXR1cm5jb2RlKQogCisKK2RlZiB1cGRhdGVfd2Via2l0Z3RrX2xpYnMoKToK ICAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3Blbihjb21tb24udG9wX2xldmVsX3BhdGgoJ1Rv b2xzJywgJ1NjcmlwdHMnLCAndXBkYXRlLXdlYmtpdGd0ay1saWJzJykpCiAgICAgcHJvY2Vzcy53 YWl0KCkKICAgICBpZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKICAgICAgICAgcmFpc2UgRXhj ZXB0aW9uKCdqaGJ1aWxkIGNvbmZpZ3VyZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUg cHJvY2Vzcy5yZXR1cm5jb2RlKQogCi1qaGJ1aWxkX3BhdGggPSBjb21tb24udG9wX2xldmVsX3Bh dGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVuY2llcycsICdSb290JywgJ2JpbicsICdqaGJ1aWxk JykKLWlmIG5vdCBvcy5wYXRoLmV4aXN0cyhqaGJ1aWxkX3BhdGgpOgotICAgIGluc3RhbGxfYW5k X3J1bl9qaGJ1aWxkKCkKKworZGVmIGVuc3VyZV9qaGJ1aWxkKCk6CisgICAgaWYgbm90IGpoYnVp bGRfY2xvbmVkKCk6CisgICAgICAgIGNsb25lX2poYnVpbGQoKQorICAgICAgICB1cGRhdGVfamhi dWlsZCgpCisgICAgICAgIGluc3RhbGxfamhidWlsZCgpCisgICAgICAgIHVwZGF0ZV93ZWJraXRn dGtfbGlicygpCisgICAgZWxpZiBub3QgamhidWlsZF9pbnN0YWxsZWQoKSBcCisgICAgICAgICAg ICBvciBub3QgamhidWlsZF9hdF9leHBlY3RlZF9yZXZpc2lvbigpOgorICAgICAgICB1cGRhdGVf amhidWlsZCgpCisgICAgICAgIGluc3RhbGxfamhidWlsZCgpCisKKworZW5zdXJlX2poYnVpbGQo KQorCiAKIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFtqaGJ1aWxkX3BhdGgsICctLW5vLWlu dGVyYWN0JywgJy1mJywgY29tbW9uLnRvcF9sZXZlbF9wYXRoKCdUb29scycsICdndGsnLCAnamhi dWlsZHJjJyksICdydW4nXSArIHN5cy5hcmd2WzE6XSkKIHByb2Nlc3Mud2FpdCgpCg==