31515 2009-11-14 18:42:26 -0800 Add bugzilla-tool check-style 2009-11-15 18:30:51 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 31422 1 abarth webkit-unassigned dbates eric oldest_to_newest 163696 0 abarth 2009-11-14 18:42:26 -0800 This will be used by the try-queue. 163697 1 43237 abarth 2009-11-14 18:51:49 -0800 Created attachment 43237 Patch 163710 2 43242 abarth 2009-11-14 22:09:03 -0800 Created attachment 43242 Patch 163711 3 43243 abarth 2009-11-14 22:28:28 -0800 Created attachment 43243 Patch 163716 4 43244 abarth 2009-11-14 23:08:42 -0800 Created attachment 43244 Patch 163786 5 43244 darin 2009-11-15 15:21:48 -0800 Comment on attachment 43244 Patch r=me 163788 6 43244 abarth 2009-11-15 15:24:43 -0800 Comment on attachment 43244 Patch Clearing flags on attachment: 43244 Committed r51001: <http://trac.webkit.org/changeset/51001> 163789 7 abarth 2009-11-15 15:24:49 -0800 All reviewed patches have been landed. Closing bug. 163827 8 43244 eric 2009-11-15 18:30:51 -0800 Comment on attachment 43244 Patch I don't like that this applies the patches to check their style. That seems unnecessary. I also don't like that this has no tests. :( 43237 2009-11-14 18:51:49 -0800 2009-11-14 22:08:52 -0800 Patch bug-31515-20091114185148.patch text/plain 4685 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTZhNTFmLi41OWY4ZmUzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEt MTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYnVnemlsbGEtdG9vbCBjaGVjay1zdHls ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE1MTUK KworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgKiBTY3JpcHRzL21v ZHVsZXMvYnVnemlsbGEucHk6CisKIDIwMDktMTEtMTMgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhh dXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmluZGV4IDZhZDI5ZTguLmM4OWVhZTUg MTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTEzNSw2ICsxMzUsMzEgQEAgY2xhc3Mg UmV2aWV3ZWRQYXRjaGVzT25CdWcoQ29tbWFuZCk6CiAgICAgICAgICAgICBwcmludCAiJXMiICUg cGF0Y2hbJ3VybCddCiAKIAorY2xhc3MgQ2hlY2tTdHlsZU9uQnVnKENvbW1hbmQpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgb3B0aW9ucyA9IFdlYktpdExhbmRpbmdTY3JpcHRz LmNsZWFuaW5nX29wdGlvbnMoKQorICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdSdW5z IGNoZWNrLXdlYmtpdC1zdHlsZSBvbiB0aGUgcj8gcGF0Y2hlcyBvbiBhIGJ1ZycsICdCVUdJRCcs IG9wdGlvbnM9b3B0aW9ucykKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBjaGVja19zdHls ZShjbHMsIGJ1Z19pZCwgcGF0Y2gsIG9wdGlvbnMsIHRvb2wpOgorICAgICAgICB0b29sLnNjbSgp LnVwZGF0ZV93ZWJraXQoKQorICAgICAgICBsb2coIkNoZWNraW5nIHN0eWxlIGZvciBwYXRjaCAl cyBmcm9tIGJ1ZyAlcy4iICUgKHBhdGNoWydpZCddLCBidWdfaWQpKQorICAgICAgICB0b29sLnNj bSgpLmFwcGx5X3BhdGNoKHBhdGNoKQorCisgICAgICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLnJ1 bl93ZWJraXRfc2NyaXB0KCJjaGVjay13ZWJraXQtc3R5bGUiKQorCisgICAgICAgIHRvb2wuc2Nt KCkuZW5zdXJlX2NsZWFuX3dvcmtpbmdfZGlyZWN0b3J5KFRydWUpCisKKyAgICBkZWYgZXhlY3V0 ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKKyAgICAgICAgYnVnX2lkID0gYXJnc1swXQor ICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX3VucmV2aWV3ZWRfcGF0Y2hlc19mcm9t X2J1ZyhidWdfaWQpCisKKyAgICAgICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMuc2V0dXBfZm9yX2xh bmRpbmcodG9vbC5zY20oKSwgb3B0aW9ucykKKworICAgICAgICBmb3IgcGF0Y2ggaW4gcGF0Y2hl czoKKyAgICAgICAgICAgIHNlbGYuY2hlY2tfc3R5bGUoYnVnX2lkLCBwYXRjaCwgb3B0aW9ucywg dG9vbCkKKworCiBjbGFzcyBBcHBseVBhdGNoZXNGcm9tQnVnKENvbW1hbmQpOgogICAgIGRlZiBf X2luaXRfXyhzZWxmKToKICAgICAgICAgb3B0aW9ucyA9IFsKQEAgLTgxMiw2ICs4MzcsNyBAQCBj bGFzcyBCdWd6aWxsYVRvb2w6CiAgICAgICAgICAgICB7ICduYW1lJyA6ICdhcHBseS1wYXRjaGVz JywgJ29iamVjdCcgOiBBcHBseVBhdGNoZXNGcm9tQnVnKCkgfSwKICAgICAgICAgICAgIHsgJ25h bWUnIDogJ2xhbmQtZGlmZicsICdvYmplY3QnIDogTGFuZEFuZFVwZGF0ZUJ1ZygpIH0sCiAgICAg ICAgICAgICB7ICduYW1lJyA6ICdsYW5kLXBhdGNoZXMnLCAnb2JqZWN0JyA6IExhbmRQYXRjaGVz RnJvbUJ1Z3MoKSB9LAorICAgICAgICAgICAgeyAnbmFtZScgOiAnY2hlY2stc3R5bGUnLCAnb2Jq ZWN0JyA6IENoZWNrU3R5bGVPbkJ1ZygpIH0sCiAgICAgICAgICAgICB7ICduYW1lJyA6ICdjb21t aXQtbWVzc2FnZScsICdvYmplY3QnIDogQ29tbWl0TWVzc2FnZUZvckN1cnJlbnREaWZmKCkgfSwK ICAgICAgICAgICAgIHsgJ25hbWUnIDogJ29ic29sZXRlLWF0dGFjaG1lbnRzJywgJ29iamVjdCcg OiBPYnNvbGV0ZUF0dGFjaG1lbnRzT25CdWcoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAn cG9zdC1kaWZmJywgJ29iamVjdCcgOiBQb3N0RGlmZkFzUGF0Y2hUb0J1ZygpIH0sCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkKaW5kZXggOWI3YzViNy4uZmJiYWViYyAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxhLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQpAQCAtMTYzLDggKzE2MywxMCBA QCBjbGFzcyBCdWd6aWxsYToKIAogICAgIGRlZiBfcGFyc2VfYXR0YWNobWVudF9mbGFnKHNlbGYs IGVsZW1lbnQsIGZsYWdfbmFtZSwgYXR0YWNobWVudCwgcmVzdWx0X2tleSk6CiAgICAgICAgIGZs YWcgPSBlbGVtZW50LmZpbmQoJ2ZsYWcnLCBhdHRycz17J25hbWUnIDogZmxhZ19uYW1lfSkKLSAg ICAgICAgaWYgZmxhZyBhbmQgZmxhZ1snc3RhdHVzJ10gPT0gJysnOgotICAgICAgICAgICAgYXR0 YWNobWVudFtyZXN1bHRfa2V5XSA9IGZsYWdbJ3NldHRlciddCisgICAgICAgIGlmIGZsYWc6Cisg ICAgICAgICAgICBhdHRhY2htZW50W2ZsYWdfbmFtZV0gPSBmbGFnWydzdGF0dXMnXQorICAgICAg ICAgICAgaWYgZmxhZ1snc3RhdHVzJ10gPT0gJysnOgorICAgICAgICAgICAgICAgIGF0dGFjaG1l bnRbcmVzdWx0X2tleV0gPSBmbGFnWydzZXR0ZXInXQogCiAgICAgZGVmIF9wYXJzZV9hdHRhY2ht ZW50X2VsZW1lbnQoc2VsZiwgZWxlbWVudCwgYnVnX2lkKToKICAgICAgICAgYXR0YWNobWVudCA9 IHt9CkBAIC0yMzMsNiArMjM1LDEzIEBAIGNsYXNzIEJ1Z3ppbGxhOgogICAgIGRlZiBfdmFsaWRh dGVfY29tbWl0dGVyKHNlbGYsIHBhdGNoLCByZWplY3RfaW52YWxpZF9wYXRjaGVzKToKICAgICAg ICAgcmV0dXJuIHNlbGYuX3ZhbGlkYXRlX3NldHRlcl9lbWFpbChwYXRjaCwgJ2NvbW1pdHRlcics IHNlbGYuY29tbWl0dGVycy5jb21taXR0ZXJfYnlfZW1haWwsIHNlbGYucmVqZWN0X3BhdGNoX2Zy b21fY29tbWl0X3F1ZXVlLCByZWplY3RfaW52YWxpZF9wYXRjaGVzKQogCisgICAgZGVmIGZldGNo X3VucmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1ZyhzZWxmLCBidWdfaWQpOgorICAgICAgICB1bnJl dmlld2VkX3BhdGNoZXMgPSBbXQorICAgICAgICBmb3IgYXR0YWNobWVudCBpbiBzZWxmLmZldGNo X2F0dGFjaG1lbnRzX2Zyb21fYnVnKGJ1Z19pZCk6CisgICAgICAgICAgICBpZiBhdHRhY2htZW50 LmdldCgncmV2aWV3JykgPT0gJz8nIGFuZCBub3QgYXR0YWNobWVudFsnaXNfb2Jzb2xldGUnXToK KyAgICAgICAgICAgICAgICB1bnJldmlld2VkX3BhdGNoZXMuYXBwZW5kKGF0dGFjaG1lbnQpCisg ICAgICAgIHJldHVybiB1bnJldmlld2VkX3BhdGNoZXMKKwogICAgIGRlZiBmZXRjaF9yZXZpZXdl ZF9wYXRjaGVzX2Zyb21fYnVnKHNlbGYsIGJ1Z19pZCwgcmVqZWN0X2ludmFsaWRfcGF0Y2hlcz1G YWxzZSk6CiAgICAgICAgIHJldmlld2VkX3BhdGNoZXMgPSBbXQogICAgICAgICBmb3IgYXR0YWNo bWVudCBpbiBzZWxmLmZldGNoX2F0dGFjaG1lbnRzX2Zyb21fYnVnKGJ1Z19pZCk6CmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5IGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL3NjbS5weQppbmRleCAzZmZhMjNiLi44YTg3YWE3IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvbW9kdWxlcy9zY20ucHkKQEAgLTE2OCw3ICsxNjgsOSBAQCBjbGFzcyBTQ006CiAgICAgICAg ICMgSXQncyBwb3NzaWJsZSB0aGF0IHRoZSBwYXRjaCB3YXMgbm90IG1hZGUgZnJvbSB0aGUgcm9v dCBkaXJlY3RvcnkuCiAgICAgICAgICMgV2Ugc2hvdWxkIGRldGVjdCBhbmQgaGFuZGxlIHRoYXQg Y2FzZS4KICAgICAgICAgY3VybF9wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbJ2N1cmwnLCAn LS1sb2NhdGlvbicsICctLXNpbGVudCcsICctLXNob3ctZXJyb3InLCBwYXRjaFsndXJsJ11dLCBz dGRvdXQ9c3VicHJvY2Vzcy5QSVBFKQotICAgICAgICBhcmdzID0gW3NlbGYuc2NyaXB0X3BhdGgo J3N2bi1hcHBseScpLCAnLS1yZXZpZXdlcicsIHBhdGNoWydyZXZpZXdlciddXQorICAgICAgICBh cmdzID0gW3NlbGYuc2NyaXB0X3BhdGgoJ3N2bi1hcHBseScpXQorICAgICAgICBpZiBwYXRjaC5n ZXQoJ3Jldmlld2VyJyk6CisgICAgICAgICAgICBhcmdzICs9IFsnLS1yZXZpZXdlcicsIHBhdGNo WydyZXZpZXdlciddXQogICAgICAgICBpZiBmb3JjZToKICAgICAgICAgICAgIGFyZ3MuYXBwZW5k KCctLWZvcmNlJyk= 43242 2009-11-14 22:09:03 -0800 2009-11-14 22:28:20 -0800 Patch bug-31515-20091114220902.patch text/plain 5999 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTZhNTFmLi41OWY4ZmUzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEt MTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYnVnemlsbGEtdG9vbCBjaGVjay1zdHls ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE1MTUK KworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgKiBTY3JpcHRzL21v ZHVsZXMvYnVnemlsbGEucHk6CisKIDIwMDktMTEtMTMgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhh dXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmluZGV4IDZhZDI5ZTguLmY5NWFlNDkg MTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTEzNSw2ICsxMzUsMzEgQEAgY2xhc3Mg UmV2aWV3ZWRQYXRjaGVzT25CdWcoQ29tbWFuZCk6CiAgICAgICAgICAgICBwcmludCAiJXMiICUg cGF0Y2hbJ3VybCddCiAKIAorY2xhc3MgQ2hlY2tTdHlsZU9uQnVnKENvbW1hbmQpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgb3B0aW9ucyA9IFdlYktpdExhbmRpbmdTY3JpcHRz LmNsZWFuaW5nX29wdGlvbnMoKQorICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdSdW5z IGNoZWNrLXdlYmtpdC1zdHlsZSBvbiB0aGUgcj8gcGF0Y2hlcyBvbiBhIGJ1ZycsICdCVUdJRCcs IG9wdGlvbnM9b3B0aW9ucykKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBjaGVja19zdHls ZShjbHMsIGJ1Z19pZCwgcGF0Y2gsIG9wdGlvbnMsIHRvb2wpOgorICAgICAgICB0b29sLnNjbSgp LnVwZGF0ZV93ZWJraXQoKQorICAgICAgICBsb2coIkNoZWNraW5nIHN0eWxlIGZvciBwYXRjaCAl cyBmcm9tIGJ1ZyAlcy4iICUgKHBhdGNoWydpZCddLCBidWdfaWQpKQorICAgICAgICB0b29sLnNj bSgpLmFwcGx5X3BhdGNoKHBhdGNoKQorCisgICAgICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLnJ1 bl93ZWJraXRfc2NyaXB0KCJjaGVjay13ZWJraXQtc3R5bGUiLCB0aHJvd19pZl9mYWlsPUZhbHNl KQorCisgICAgICAgIHRvb2wuc2NtKCkuZW5zdXJlX2NsZWFuX3dvcmtpbmdfZGlyZWN0b3J5KFRy dWUpCisKKyAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKKyAgICAg ICAgYnVnX2lkID0gYXJnc1swXQorICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX3Vu cmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1ZyhidWdfaWQpCisKKyAgICAgICAgV2ViS2l0TGFuZGlu Z1NjcmlwdHMuc2V0dXBfZm9yX2xhbmRpbmcodG9vbC5zY20oKSwgb3B0aW9ucykKKworICAgICAg ICBmb3IgcGF0Y2ggaW4gcGF0Y2hlczoKKyAgICAgICAgICAgIHNlbGYuY2hlY2tfc3R5bGUoYnVn X2lkLCBwYXRjaCwgb3B0aW9ucywgdG9vbCkKKworCiBjbGFzcyBBcHBseVBhdGNoZXNGcm9tQnVn KENvbW1hbmQpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAgb3B0aW9ucyA9IFsK QEAgLTE5OSw3ICsyMjQsNyBAQCBjbGFzcyBXZWJLaXRMYW5kaW5nU2NyaXB0czoKICAgICAgICAg ICAgIHRlZWRfb3V0cHV0LndyaXRlKG91dHB1dF9saW5lKQogCiAgICAgQHN0YXRpY21ldGhvZAot ICAgIGRlZiBydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgcXVpZXQ9RmFsc2UpOgorICAgIGRl ZiBydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgcXVpZXQ9RmFsc2UsIHRocm93X2lmX2ZhaWw9 VHJ1ZSk6CiAgICAgICAgICMgQ2FjaGUgdGhlIGNoaWxkJ3Mgb3V0cHV0IGxvY2FsbHkgc28gaXQg Y2FuIGJlIHVzZWQgZm9yIGVycm9yIHJlcG9ydHMuCiAgICAgICAgIGNoaWxkX291dF9maWxlID0g U3RyaW5nSU8uU3RyaW5nSU8oKQogICAgICAgICBpZiBxdWlldDoKQEAgLTIxMiw3ICsyMzcsNyBA QCBjbGFzcyBXZWJLaXRMYW5kaW5nU2NyaXB0czoKICAgICAgICAgY2hpbGRfb3V0cHV0ID0gY2hp bGRfb3V0X2ZpbGUuZ2V0dmFsdWUoKQogICAgICAgICBjaGlsZF9vdXRfZmlsZS5jbG9zZSgpCiAK LSAgICAgICAgaWYgZXhpdF9jb2RlOgorICAgICAgICBpZiB0aHJvd19pZl9mYWlsIGFuZCBleGl0 X2NvZGU6CiAgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihzY3JpcHRfYXJncz1hcmdzLCBl eGl0X2NvZGU9ZXhpdF9jb2RlLCBvdXRwdXQ9Y2hpbGRfb3V0cHV0KQogCiAgICAgIyBXZSBtaWdo dCBuZWVkIHRvIHBhc3Mgc2NtIGludG8gdGhpcyBmdW5jdGlvbiBmb3Igc2NtLmNoZWNrb3V0X3Jv b3QKQEAgLTIyMSw5ICsyNDYsOSBAQCBjbGFzcyBXZWJLaXRMYW5kaW5nU2NyaXB0czoKICAgICAg ICAgcmV0dXJuIG9zLnBhdGguam9pbigiV2ViS2l0VG9vbHMiLCAiU2NyaXB0cyIsIHNjcmlwdF9u YW1lKQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHJ1bl93ZWJraXRfc2NyaXB0KGNscywg c2NyaXB0X25hbWUsIHF1aWV0PUZhbHNlKToKKyAgICBkZWYgcnVuX3dlYmtpdF9zY3JpcHQoY2xz LCBzY3JpcHRfbmFtZSwgcXVpZXQ9RmFsc2UsIHRocm93X2lmX2ZhaWw9VHJ1ZSk6CiAgICAgICAg IGxvZygiUnVubmluZyAlcyIgJSBzY3JpcHRfbmFtZSkKLSAgICAgICAgY2xzLnJ1bl9hbmRfdGhy b3dfaWZfZmFpbChjbHMud2Via2l0X3NjcmlwdF9wYXRoKHNjcmlwdF9uYW1lKSwgcXVpZXQpCisg ICAgICAgIGNscy5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoY2xzLndlYmtpdF9zY3JpcHRfcGF0aChz Y3JpcHRfbmFtZSksIHF1aWV0LCB0aHJvd19pZl9mYWlsKQogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIGJ1aWxkX3dlYmtpdChjbHMsIHF1aWV0PUZhbHNlKToKQEAgLTgxMiw2ICs4MzcsNyBA QCBjbGFzcyBCdWd6aWxsYVRvb2w6CiAgICAgICAgICAgICB7ICduYW1lJyA6ICdhcHBseS1wYXRj aGVzJywgJ29iamVjdCcgOiBBcHBseVBhdGNoZXNGcm9tQnVnKCkgfSwKICAgICAgICAgICAgIHsg J25hbWUnIDogJ2xhbmQtZGlmZicsICdvYmplY3QnIDogTGFuZEFuZFVwZGF0ZUJ1ZygpIH0sCiAg ICAgICAgICAgICB7ICduYW1lJyA6ICdsYW5kLXBhdGNoZXMnLCAnb2JqZWN0JyA6IExhbmRQYXRj aGVzRnJvbUJ1Z3MoKSB9LAorICAgICAgICAgICAgeyAnbmFtZScgOiAnY2hlY2stc3R5bGUnLCAn b2JqZWN0JyA6IENoZWNrU3R5bGVPbkJ1ZygpIH0sCiAgICAgICAgICAgICB7ICduYW1lJyA6ICdj b21taXQtbWVzc2FnZScsICdvYmplY3QnIDogQ29tbWl0TWVzc2FnZUZvckN1cnJlbnREaWZmKCkg fSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ29ic29sZXRlLWF0dGFjaG1lbnRzJywgJ29iamVj dCcgOiBPYnNvbGV0ZUF0dGFjaG1lbnRzT25CdWcoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScg OiAncG9zdC1kaWZmJywgJ29iamVjdCcgOiBQb3N0RGlmZkFzUGF0Y2hUb0J1ZygpIH0sCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkKaW5kZXggOWI3YzViNy4uZmJiYWViYyAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxhLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQpAQCAtMTYzLDggKzE2Mywx MCBAQCBjbGFzcyBCdWd6aWxsYToKIAogICAgIGRlZiBfcGFyc2VfYXR0YWNobWVudF9mbGFnKHNl bGYsIGVsZW1lbnQsIGZsYWdfbmFtZSwgYXR0YWNobWVudCwgcmVzdWx0X2tleSk6CiAgICAgICAg IGZsYWcgPSBlbGVtZW50LmZpbmQoJ2ZsYWcnLCBhdHRycz17J25hbWUnIDogZmxhZ19uYW1lfSkK LSAgICAgICAgaWYgZmxhZyBhbmQgZmxhZ1snc3RhdHVzJ10gPT0gJysnOgotICAgICAgICAgICAg YXR0YWNobWVudFtyZXN1bHRfa2V5XSA9IGZsYWdbJ3NldHRlciddCisgICAgICAgIGlmIGZsYWc6 CisgICAgICAgICAgICBhdHRhY2htZW50W2ZsYWdfbmFtZV0gPSBmbGFnWydzdGF0dXMnXQorICAg ICAgICAgICAgaWYgZmxhZ1snc3RhdHVzJ10gPT0gJysnOgorICAgICAgICAgICAgICAgIGF0dGFj aG1lbnRbcmVzdWx0X2tleV0gPSBmbGFnWydzZXR0ZXInXQogCiAgICAgZGVmIF9wYXJzZV9hdHRh Y2htZW50X2VsZW1lbnQoc2VsZiwgZWxlbWVudCwgYnVnX2lkKToKICAgICAgICAgYXR0YWNobWVu dCA9IHt9CkBAIC0yMzMsNiArMjM1LDEzIEBAIGNsYXNzIEJ1Z3ppbGxhOgogICAgIGRlZiBfdmFs aWRhdGVfY29tbWl0dGVyKHNlbGYsIHBhdGNoLCByZWplY3RfaW52YWxpZF9wYXRjaGVzKToKICAg ICAgICAgcmV0dXJuIHNlbGYuX3ZhbGlkYXRlX3NldHRlcl9lbWFpbChwYXRjaCwgJ2NvbW1pdHRl cicsIHNlbGYuY29tbWl0dGVycy5jb21taXR0ZXJfYnlfZW1haWwsIHNlbGYucmVqZWN0X3BhdGNo X2Zyb21fY29tbWl0X3F1ZXVlLCByZWplY3RfaW52YWxpZF9wYXRjaGVzKQogCisgICAgZGVmIGZl dGNoX3VucmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1ZyhzZWxmLCBidWdfaWQpOgorICAgICAgICB1 bnJldmlld2VkX3BhdGNoZXMgPSBbXQorICAgICAgICBmb3IgYXR0YWNobWVudCBpbiBzZWxmLmZl dGNoX2F0dGFjaG1lbnRzX2Zyb21fYnVnKGJ1Z19pZCk6CisgICAgICAgICAgICBpZiBhdHRhY2ht ZW50LmdldCgncmV2aWV3JykgPT0gJz8nIGFuZCBub3QgYXR0YWNobWVudFsnaXNfb2Jzb2xldGUn XToKKyAgICAgICAgICAgICAgICB1bnJldmlld2VkX3BhdGNoZXMuYXBwZW5kKGF0dGFjaG1lbnQp CisgICAgICAgIHJldHVybiB1bnJldmlld2VkX3BhdGNoZXMKKwogICAgIGRlZiBmZXRjaF9yZXZp ZXdlZF9wYXRjaGVzX2Zyb21fYnVnKHNlbGYsIGJ1Z19pZCwgcmVqZWN0X2ludmFsaWRfcGF0Y2hl cz1GYWxzZSk6CiAgICAgICAgIHJldmlld2VkX3BhdGNoZXMgPSBbXQogICAgICAgICBmb3IgYXR0 YWNobWVudCBpbiBzZWxmLmZldGNoX2F0dGFjaG1lbnRzX2Zyb21fYnVnKGJ1Z19pZCk6CmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL3NjbS5weQppbmRleCAzZmZhMjNiLi44YTg3YWE3IDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9zY20ucHkKQEAgLTE2OCw3ICsxNjgsOSBAQCBjbGFzcyBTQ006CiAgICAg ICAgICMgSXQncyBwb3NzaWJsZSB0aGF0IHRoZSBwYXRjaCB3YXMgbm90IG1hZGUgZnJvbSB0aGUg cm9vdCBkaXJlY3RvcnkuCiAgICAgICAgICMgV2Ugc2hvdWxkIGRldGVjdCBhbmQgaGFuZGxlIHRo YXQgY2FzZS4KICAgICAgICAgY3VybF9wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbJ2N1cmwn LCAnLS1sb2NhdGlvbicsICctLXNpbGVudCcsICctLXNob3ctZXJyb3InLCBwYXRjaFsndXJsJ11d LCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFKQotICAgICAgICBhcmdzID0gW3NlbGYuc2NyaXB0X3Bh dGgoJ3N2bi1hcHBseScpLCAnLS1yZXZpZXdlcicsIHBhdGNoWydyZXZpZXdlciddXQorICAgICAg ICBhcmdzID0gW3NlbGYuc2NyaXB0X3BhdGgoJ3N2bi1hcHBseScpXQorICAgICAgICBpZiBwYXRj aC5nZXQoJ3Jldmlld2VyJyk6CisgICAgICAgICAgICBhcmdzICs9IFsnLS1yZXZpZXdlcicsIHBh dGNoWydyZXZpZXdlciddXQogICAgICAgICBpZiBmb3JjZToKICAgICAgICAgICAgIGFyZ3MuYXBw ZW5kKCctLWZvcmNlJyk= 43243 2009-11-14 22:28:28 -0800 2009-11-14 23:08:33 -0800 Patch bug-31515-20091114222826.patch text/plain 6136 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTZhNTFmLi41OWY4ZmUzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEt MTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYnVnemlsbGEtdG9vbCBjaGVjay1zdHls ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE1MTUK KworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgKiBTY3JpcHRzL21v ZHVsZXMvYnVnemlsbGEucHk6CisKIDIwMDktMTEtMTMgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhh dXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmluZGV4IDZhZDI5ZTguLjU2NDA2ZGMg MTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTEzNSw2ICsxMzUsMzQgQEAgY2xhc3Mg UmV2aWV3ZWRQYXRjaGVzT25CdWcoQ29tbWFuZCk6CiAgICAgICAgICAgICBwcmludCAiJXMiICUg cGF0Y2hbJ3VybCddCiAKIAorY2xhc3MgQ2hlY2tTdHlsZU9uQnVnKENvbW1hbmQpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgb3B0aW9ucyA9IFdlYktpdExhbmRpbmdTY3JpcHRz LmNsZWFuaW5nX29wdGlvbnMoKQorICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdSdW5z IGNoZWNrLXdlYmtpdC1zdHlsZSBvbiB0aGUgcj8gcGF0Y2hlcyBvbiBhIGJ1ZycsICdCVUdJRCcs IG9wdGlvbnM9b3B0aW9ucykKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBjaGVja19zdHls ZShjbHMsIGJ1Z19pZCwgcGF0Y2gsIG9wdGlvbnMsIHRvb2wpOgorICAgICAgICB0b29sLnNjbSgp LnVwZGF0ZV93ZWJraXQoKQorICAgICAgICBsb2coIkNoZWNraW5nIHN0eWxlIGZvciBwYXRjaCAl cyBmcm9tIGJ1ZyAlcy4iICUgKHBhdGNoWydpZCddLCBidWdfaWQpKQorICAgICAgICB0cnk6Cisg ICAgICAgICAgICB0b29sLnNjbSgpLmFwcGx5X3BhdGNoKHBhdGNoKQorICAgICAgICAgICAgV2Vi S2l0TGFuZGluZ1NjcmlwdHMucnVuX3dlYmtpdF9zY3JpcHQoImNoZWNrLXdlYmtpdC1zdHlsZSIs IHRocm93X2lmX2ZhaWw9RmFsc2UpCisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAg ICAgICAgICAgIGxvZygiUGF0Y2ggZmFpbGVkIHRvIGFwcGx5IGFuZCBjaGVjayBzdHlsZSIpCisg ICAgICAgICAgICBsb2coZS5vdXRwdXQpCisKKyAgICAgICAgdG9vbC5zY20oKS5lbnN1cmVfY2xl YW5fd29ya2luZ19kaXJlY3RvcnkoVHJ1ZSkKKworICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlv bnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICBidWdfaWQgPSBhcmdzWzBdCisgICAgICAgIHBhdGNo ZXMgPSB0b29sLmJ1Z3MuZmV0Y2hfdW5yZXZpZXdlZF9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCkK KworICAgICAgICBXZWJLaXRMYW5kaW5nU2NyaXB0cy5zZXR1cF9mb3JfbGFuZGluZyh0b29sLnNj bSgpLCBvcHRpb25zKQorCisgICAgICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgorICAgICAgICAg ICAgc2VsZi5jaGVja19zdHlsZShidWdfaWQsIHBhdGNoLCBvcHRpb25zLCB0b29sKQorCisKIGNs YXNzIEFwcGx5UGF0Y2hlc0Zyb21CdWcoQ29tbWFuZCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYp OgogICAgICAgICBvcHRpb25zID0gWwpAQCAtMTk5LDcgKzIyNyw3IEBAIGNsYXNzIFdlYktpdExh bmRpbmdTY3JpcHRzOgogICAgICAgICAgICAgdGVlZF9vdXRwdXQud3JpdGUob3V0cHV0X2xpbmUp CiAKICAgICBAc3RhdGljbWV0aG9kCi0gICAgZGVmIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbChhcmdz LCBxdWlldD1GYWxzZSk6CisgICAgZGVmIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbChhcmdzLCBxdWll dD1GYWxzZSwgdGhyb3dfaWZfZmFpbD1UcnVlKToKICAgICAgICAgIyBDYWNoZSB0aGUgY2hpbGQn cyBvdXRwdXQgbG9jYWxseSBzbyBpdCBjYW4gYmUgdXNlZCBmb3IgZXJyb3IgcmVwb3J0cy4KICAg ICAgICAgY2hpbGRfb3V0X2ZpbGUgPSBTdHJpbmdJTy5TdHJpbmdJTygpCiAgICAgICAgIGlmIHF1 aWV0OgpAQCAtMjEyLDcgKzI0MCw3IEBAIGNsYXNzIFdlYktpdExhbmRpbmdTY3JpcHRzOgogICAg ICAgICBjaGlsZF9vdXRwdXQgPSBjaGlsZF9vdXRfZmlsZS5nZXR2YWx1ZSgpCiAgICAgICAgIGNo aWxkX291dF9maWxlLmNsb3NlKCkKIAotICAgICAgICBpZiBleGl0X2NvZGU6CisgICAgICAgIGlm IHRocm93X2lmX2ZhaWwgYW5kIGV4aXRfY29kZToKICAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVy cm9yKHNjcmlwdF9hcmdzPWFyZ3MsIGV4aXRfY29kZT1leGl0X2NvZGUsIG91dHB1dD1jaGlsZF9v dXRwdXQpCiAKICAgICAjIFdlIG1pZ2h0IG5lZWQgdG8gcGFzcyBzY20gaW50byB0aGlzIGZ1bmN0 aW9uIGZvciBzY20uY2hlY2tvdXRfcm9vdApAQCAtMjIxLDkgKzI0OSw5IEBAIGNsYXNzIFdlYktp dExhbmRpbmdTY3JpcHRzOgogICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKCJXZWJLaXRUb29s cyIsICJTY3JpcHRzIiwgc2NyaXB0X25hbWUpCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYg cnVuX3dlYmtpdF9zY3JpcHQoY2xzLCBzY3JpcHRfbmFtZSwgcXVpZXQ9RmFsc2UpOgorICAgIGRl ZiBydW5fd2Via2l0X3NjcmlwdChjbHMsIHNjcmlwdF9uYW1lLCBxdWlldD1GYWxzZSwgdGhyb3df aWZfZmFpbD1UcnVlKToKICAgICAgICAgbG9nKCJSdW5uaW5nICVzIiAlIHNjcmlwdF9uYW1lKQot ICAgICAgICBjbHMucnVuX2FuZF90aHJvd19pZl9mYWlsKGNscy53ZWJraXRfc2NyaXB0X3BhdGgo c2NyaXB0X25hbWUpLCBxdWlldCkKKyAgICAgICAgY2xzLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChj bHMud2Via2l0X3NjcmlwdF9wYXRoKHNjcmlwdF9uYW1lKSwgcXVpZXQsIHRocm93X2lmX2ZhaWwp CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgYnVpbGRfd2Via2l0KGNscywgcXVpZXQ9RmFs c2UpOgpAQCAtODEyLDYgKzg0MCw3IEBAIGNsYXNzIEJ1Z3ppbGxhVG9vbDoKICAgICAgICAgICAg IHsgJ25hbWUnIDogJ2FwcGx5LXBhdGNoZXMnLCAnb2JqZWN0JyA6IEFwcGx5UGF0Y2hlc0Zyb21C dWcoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAnbGFuZC1kaWZmJywgJ29iamVjdCcgOiBM YW5kQW5kVXBkYXRlQnVnKCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ2xhbmQtcGF0Y2hl cycsICdvYmplY3QnIDogTGFuZFBhdGNoZXNGcm9tQnVncygpIH0sCisgICAgICAgICAgICB7ICdu YW1lJyA6ICdjaGVjay1zdHlsZScsICdvYmplY3QnIDogQ2hlY2tTdHlsZU9uQnVnKCkgfSwKICAg ICAgICAgICAgIHsgJ25hbWUnIDogJ2NvbW1pdC1tZXNzYWdlJywgJ29iamVjdCcgOiBDb21taXRN ZXNzYWdlRm9yQ3VycmVudERpZmYoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAnb2Jzb2xl dGUtYXR0YWNobWVudHMnLCAnb2JqZWN0JyA6IE9ic29sZXRlQXR0YWNobWVudHNPbkJ1ZygpIH0s CiAgICAgICAgICAgICB7ICduYW1lJyA6ICdwb3N0LWRpZmYnLCAnb2JqZWN0JyA6IFBvc3REaWZm QXNQYXRjaFRvQnVnKCkgfSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQpp bmRleCA5YjdjNWI3Li5mYmJhZWJjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvYnVnemlsbGEucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3pp bGxhLnB5CkBAIC0xNjMsOCArMTYzLDEwIEBAIGNsYXNzIEJ1Z3ppbGxhOgogCiAgICAgZGVmIF9w YXJzZV9hdHRhY2htZW50X2ZsYWcoc2VsZiwgZWxlbWVudCwgZmxhZ19uYW1lLCBhdHRhY2htZW50 LCByZXN1bHRfa2V5KToKICAgICAgICAgZmxhZyA9IGVsZW1lbnQuZmluZCgnZmxhZycsIGF0dHJz PXsnbmFtZScgOiBmbGFnX25hbWV9KQotICAgICAgICBpZiBmbGFnIGFuZCBmbGFnWydzdGF0dXMn XSA9PSAnKyc6Ci0gICAgICAgICAgICBhdHRhY2htZW50W3Jlc3VsdF9rZXldID0gZmxhZ1snc2V0 dGVyJ10KKyAgICAgICAgaWYgZmxhZzoKKyAgICAgICAgICAgIGF0dGFjaG1lbnRbZmxhZ19uYW1l XSA9IGZsYWdbJ3N0YXR1cyddCisgICAgICAgICAgICBpZiBmbGFnWydzdGF0dXMnXSA9PSAnKyc6 CisgICAgICAgICAgICAgICAgYXR0YWNobWVudFtyZXN1bHRfa2V5XSA9IGZsYWdbJ3NldHRlcidd CiAKICAgICBkZWYgX3BhcnNlX2F0dGFjaG1lbnRfZWxlbWVudChzZWxmLCBlbGVtZW50LCBidWdf aWQpOgogICAgICAgICBhdHRhY2htZW50ID0ge30KQEAgLTIzMyw2ICsyMzUsMTMgQEAgY2xhc3Mg QnVnemlsbGE6CiAgICAgZGVmIF92YWxpZGF0ZV9jb21taXR0ZXIoc2VsZiwgcGF0Y2gsIHJlamVj dF9pbnZhbGlkX3BhdGNoZXMpOgogICAgICAgICByZXR1cm4gc2VsZi5fdmFsaWRhdGVfc2V0dGVy X2VtYWlsKHBhdGNoLCAnY29tbWl0dGVyJywgc2VsZi5jb21taXR0ZXJzLmNvbW1pdHRlcl9ieV9l bWFpbCwgc2VsZi5yZWplY3RfcGF0Y2hfZnJvbV9jb21taXRfcXVldWUsIHJlamVjdF9pbnZhbGlk X3BhdGNoZXMpCiAKKyAgICBkZWYgZmV0Y2hfdW5yZXZpZXdlZF9wYXRjaGVzX2Zyb21fYnVnKHNl bGYsIGJ1Z19pZCk6CisgICAgICAgIHVucmV2aWV3ZWRfcGF0Y2hlcyA9IFtdCisgICAgICAgIGZv ciBhdHRhY2htZW50IGluIHNlbGYuZmV0Y2hfYXR0YWNobWVudHNfZnJvbV9idWcoYnVnX2lkKToK KyAgICAgICAgICAgIGlmIGF0dGFjaG1lbnQuZ2V0KCdyZXZpZXcnKSA9PSAnPycgYW5kIG5vdCBh dHRhY2htZW50Wydpc19vYnNvbGV0ZSddOgorICAgICAgICAgICAgICAgIHVucmV2aWV3ZWRfcGF0 Y2hlcy5hcHBlbmQoYXR0YWNobWVudCkKKyAgICAgICAgcmV0dXJuIHVucmV2aWV3ZWRfcGF0Y2hl cworCiAgICAgZGVmIGZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJvbV9idWcoc2VsZiwgYnVnX2lk LCByZWplY3RfaW52YWxpZF9wYXRjaGVzPUZhbHNlKToKICAgICAgICAgcmV2aWV3ZWRfcGF0Y2hl cyA9IFtdCiAgICAgICAgIGZvciBhdHRhY2htZW50IGluIHNlbGYuZmV0Y2hfYXR0YWNobWVudHNf ZnJvbV9idWcoYnVnX2lkKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9zY20ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CmluZGV4IDNmZmEy M2IuLjhhODdhYTcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20u cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQpAQCAtMTY4LDcgKzE2 OCw5IEBAIGNsYXNzIFNDTToKICAgICAgICAgIyBJdCdzIHBvc3NpYmxlIHRoYXQgdGhlIHBhdGNo IHdhcyBub3QgbWFkZSBmcm9tIHRoZSByb290IGRpcmVjdG9yeS4KICAgICAgICAgIyBXZSBzaG91 bGQgZGV0ZWN0IGFuZCBoYW5kbGUgdGhhdCBjYXNlLgogICAgICAgICBjdXJsX3Byb2Nlc3MgPSBz dWJwcm9jZXNzLlBvcGVuKFsnY3VybCcsICctLWxvY2F0aW9uJywgJy0tc2lsZW50JywgJy0tc2hv dy1lcnJvcicsIHBhdGNoWyd1cmwnXV0sIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpCi0gICAgICAg IGFyZ3MgPSBbc2VsZi5zY3JpcHRfcGF0aCgnc3ZuLWFwcGx5JyksICctLXJldmlld2VyJywgcGF0 Y2hbJ3Jldmlld2VyJ11dCisgICAgICAgIGFyZ3MgPSBbc2VsZi5zY3JpcHRfcGF0aCgnc3ZuLWFw cGx5JyldCisgICAgICAgIGlmIHBhdGNoLmdldCgncmV2aWV3ZXInKToKKyAgICAgICAgICAgIGFy Z3MgKz0gWyctLXJldmlld2VyJywgcGF0Y2hbJ3Jldmlld2VyJ11dCiAgICAgICAgIGlmIGZvcmNl OgogICAgICAgICAgICAgYXJncy5hcHBlbmQoJy0tZm9yY2UnKQ== 43244 2009-11-14 23:08:42 -0800 2009-11-15 18:30:50 -0800 Patch bug-31515-20091114230841.patch text/plain 4822 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTZhNTFmLi41OWY4ZmUzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEt MTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYnVnemlsbGEtdG9vbCBjaGVjay1zdHls ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE1MTUK KworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgKiBTY3JpcHRzL21v ZHVsZXMvYnVnemlsbGEucHk6CisKIDIwMDktMTEtMTMgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhh dXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmluZGV4IDZhZDI5ZTguLmVhNGE5ODEg MTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTEzNSw2ICsxMzUsMzQgQEAgY2xhc3Mg UmV2aWV3ZWRQYXRjaGVzT25CdWcoQ29tbWFuZCk6CiAgICAgICAgICAgICBwcmludCAiJXMiICUg cGF0Y2hbJ3VybCddCiAKIAorY2xhc3MgQ2hlY2tTdHlsZU9uQnVnKENvbW1hbmQpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgb3B0aW9ucyA9IFdlYktpdExhbmRpbmdTY3JpcHRz LmNsZWFuaW5nX29wdGlvbnMoKQorICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdSdW5z IGNoZWNrLXdlYmtpdC1zdHlsZSBvbiB0aGUgcj8gcGF0Y2hlcyBvbiBhIGJ1ZycsICdCVUdJRCcs IG9wdGlvbnM9b3B0aW9ucykKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBjaGVja19zdHls ZShjbHMsIGJ1Z19pZCwgcGF0Y2gsIG9wdGlvbnMsIHRvb2wpOgorICAgICAgICB0b29sLnNjbSgp LnVwZGF0ZV93ZWJraXQoKQorICAgICAgICBsb2coIkNoZWNraW5nIHN0eWxlIGZvciBwYXRjaCAl cyBmcm9tIGJ1ZyAlcy4iICUgKHBhdGNoWydpZCddLCBidWdfaWQpKQorICAgICAgICB0cnk6Cisg ICAgICAgICAgICB0b29sLnNjbSgpLmFwcGx5X3BhdGNoKHBhdGNoKQorICAgICAgICAgICAgV2Vi S2l0TGFuZGluZ1NjcmlwdHMucnVuX3dlYmtpdF9zY3JpcHQoImNoZWNrLXdlYmtpdC1zdHlsZSIp CisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAgICAgICAgICAgIGxvZygiUGF0Y2gg ZmFpbGVkIHRvIGFwcGx5IGFuZCBjaGVjayBzdHlsZSIpCisgICAgICAgICAgICBsb2coZS5vdXRw dXQpCisKKyAgICAgICAgdG9vbC5zY20oKS5lbnN1cmVfY2xlYW5fd29ya2luZ19kaXJlY3Rvcnko VHJ1ZSkKKworICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAg ICAgICBidWdfaWQgPSBhcmdzWzBdCisgICAgICAgIHBhdGNoZXMgPSB0b29sLmJ1Z3MuZmV0Y2hf dW5yZXZpZXdlZF9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCkKKworICAgICAgICBXZWJLaXRMYW5k aW5nU2NyaXB0cy5zZXR1cF9mb3JfbGFuZGluZyh0b29sLnNjbSgpLCBvcHRpb25zKQorCisgICAg ICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgorICAgICAgICAgICAgc2VsZi5jaGVja19zdHlsZShi dWdfaWQsIHBhdGNoLCBvcHRpb25zLCB0b29sKQorCisKIGNsYXNzIEFwcGx5UGF0Y2hlc0Zyb21C dWcoQ29tbWFuZCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAgICBvcHRpb25zID0g WwpAQCAtODEyLDYgKzg0MCw3IEBAIGNsYXNzIEJ1Z3ppbGxhVG9vbDoKICAgICAgICAgICAgIHsg J25hbWUnIDogJ2FwcGx5LXBhdGNoZXMnLCAnb2JqZWN0JyA6IEFwcGx5UGF0Y2hlc0Zyb21CdWco KSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAnbGFuZC1kaWZmJywgJ29iamVjdCcgOiBMYW5k QW5kVXBkYXRlQnVnKCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ2xhbmQtcGF0Y2hlcycs ICdvYmplY3QnIDogTGFuZFBhdGNoZXNGcm9tQnVncygpIH0sCisgICAgICAgICAgICB7ICduYW1l JyA6ICdjaGVjay1zdHlsZScsICdvYmplY3QnIDogQ2hlY2tTdHlsZU9uQnVnKCkgfSwKICAgICAg ICAgICAgIHsgJ25hbWUnIDogJ2NvbW1pdC1tZXNzYWdlJywgJ29iamVjdCcgOiBDb21taXRNZXNz YWdlRm9yQ3VycmVudERpZmYoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAnb2Jzb2xldGUt YXR0YWNobWVudHMnLCAnb2JqZWN0JyA6IE9ic29sZXRlQXR0YWNobWVudHNPbkJ1ZygpIH0sCiAg ICAgICAgICAgICB7ICduYW1lJyA6ICdwb3N0LWRpZmYnLCAnb2JqZWN0JyA6IFBvc3REaWZmQXNQ YXRjaFRvQnVnKCkgfSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9i dWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQppbmRl eCA5YjdjNWI3Li5mYmJhZWJjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvYnVnemlsbGEucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxh LnB5CkBAIC0xNjMsOCArMTYzLDEwIEBAIGNsYXNzIEJ1Z3ppbGxhOgogCiAgICAgZGVmIF9wYXJz ZV9hdHRhY2htZW50X2ZsYWcoc2VsZiwgZWxlbWVudCwgZmxhZ19uYW1lLCBhdHRhY2htZW50LCBy ZXN1bHRfa2V5KToKICAgICAgICAgZmxhZyA9IGVsZW1lbnQuZmluZCgnZmxhZycsIGF0dHJzPXsn bmFtZScgOiBmbGFnX25hbWV9KQotICAgICAgICBpZiBmbGFnIGFuZCBmbGFnWydzdGF0dXMnXSA9 PSAnKyc6Ci0gICAgICAgICAgICBhdHRhY2htZW50W3Jlc3VsdF9rZXldID0gZmxhZ1snc2V0dGVy J10KKyAgICAgICAgaWYgZmxhZzoKKyAgICAgICAgICAgIGF0dGFjaG1lbnRbZmxhZ19uYW1lXSA9 IGZsYWdbJ3N0YXR1cyddCisgICAgICAgICAgICBpZiBmbGFnWydzdGF0dXMnXSA9PSAnKyc6Cisg ICAgICAgICAgICAgICAgYXR0YWNobWVudFtyZXN1bHRfa2V5XSA9IGZsYWdbJ3NldHRlciddCiAK ICAgICBkZWYgX3BhcnNlX2F0dGFjaG1lbnRfZWxlbWVudChzZWxmLCBlbGVtZW50LCBidWdfaWQp OgogICAgICAgICBhdHRhY2htZW50ID0ge30KQEAgLTIzMyw2ICsyMzUsMTMgQEAgY2xhc3MgQnVn emlsbGE6CiAgICAgZGVmIF92YWxpZGF0ZV9jb21taXR0ZXIoc2VsZiwgcGF0Y2gsIHJlamVjdF9p bnZhbGlkX3BhdGNoZXMpOgogICAgICAgICByZXR1cm4gc2VsZi5fdmFsaWRhdGVfc2V0dGVyX2Vt YWlsKHBhdGNoLCAnY29tbWl0dGVyJywgc2VsZi5jb21taXR0ZXJzLmNvbW1pdHRlcl9ieV9lbWFp bCwgc2VsZi5yZWplY3RfcGF0Y2hfZnJvbV9jb21taXRfcXVldWUsIHJlamVjdF9pbnZhbGlkX3Bh dGNoZXMpCiAKKyAgICBkZWYgZmV0Y2hfdW5yZXZpZXdlZF9wYXRjaGVzX2Zyb21fYnVnKHNlbGYs IGJ1Z19pZCk6CisgICAgICAgIHVucmV2aWV3ZWRfcGF0Y2hlcyA9IFtdCisgICAgICAgIGZvciBh dHRhY2htZW50IGluIHNlbGYuZmV0Y2hfYXR0YWNobWVudHNfZnJvbV9idWcoYnVnX2lkKToKKyAg ICAgICAgICAgIGlmIGF0dGFjaG1lbnQuZ2V0KCdyZXZpZXcnKSA9PSAnPycgYW5kIG5vdCBhdHRh Y2htZW50Wydpc19vYnNvbGV0ZSddOgorICAgICAgICAgICAgICAgIHVucmV2aWV3ZWRfcGF0Y2hl cy5hcHBlbmQoYXR0YWNobWVudCkKKyAgICAgICAgcmV0dXJuIHVucmV2aWV3ZWRfcGF0Y2hlcwor CiAgICAgZGVmIGZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJvbV9idWcoc2VsZiwgYnVnX2lkLCBy ZWplY3RfaW52YWxpZF9wYXRjaGVzPUZhbHNlKToKICAgICAgICAgcmV2aWV3ZWRfcGF0Y2hlcyA9 IFtdCiAgICAgICAgIGZvciBhdHRhY2htZW50IGluIHNlbGYuZmV0Y2hfYXR0YWNobWVudHNfZnJv bV9idWcoYnVnX2lkKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9z Y20ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CmluZGV4IDNmZmEyM2Iu LjhhODdhYTcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQpAQCAtMTY4LDcgKzE2OCw5 IEBAIGNsYXNzIFNDTToKICAgICAgICAgIyBJdCdzIHBvc3NpYmxlIHRoYXQgdGhlIHBhdGNoIHdh cyBub3QgbWFkZSBmcm9tIHRoZSByb290IGRpcmVjdG9yeS4KICAgICAgICAgIyBXZSBzaG91bGQg ZGV0ZWN0IGFuZCBoYW5kbGUgdGhhdCBjYXNlLgogICAgICAgICBjdXJsX3Byb2Nlc3MgPSBzdWJw cm9jZXNzLlBvcGVuKFsnY3VybCcsICctLWxvY2F0aW9uJywgJy0tc2lsZW50JywgJy0tc2hvdy1l cnJvcicsIHBhdGNoWyd1cmwnXV0sIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpCi0gICAgICAgIGFy Z3MgPSBbc2VsZi5zY3JpcHRfcGF0aCgnc3ZuLWFwcGx5JyksICctLXJldmlld2VyJywgcGF0Y2hb J3Jldmlld2VyJ11dCisgICAgICAgIGFyZ3MgPSBbc2VsZi5zY3JpcHRfcGF0aCgnc3ZuLWFwcGx5 JyldCisgICAgICAgIGlmIHBhdGNoLmdldCgncmV2aWV3ZXInKToKKyAgICAgICAgICAgIGFyZ3Mg Kz0gWyctLXJldmlld2VyJywgcGF0Y2hbJ3Jldmlld2VyJ11dCiAgICAgICAgIGlmIGZvcmNlOgog ICAgICAgICAgICAgYXJncy5hcHBlbmQoJy0tZm9yY2UnKQ==