31744 2009-11-20 14:08:05 -0800 BuildQueue should check if the tree is currently buildable 2009-11-20 14:53:06 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned eric oldest_to_newest 165441 0 abarth 2009-11-20 14:08:05 -0800 This will reduce false rejections. 165443 1 43612 abarth 2009-11-20 14:09:02 -0800 Created attachment 43612 Patch 165449 2 43612 eric 2009-11-20 14:21:10 -0800 Comment on attachment 43612 Patch "clean" build is overloaded. Not what you want. Probably just "build" 152 Command.__init__(self, "Updates working copy and does a clean build.", "tt", options) 790 self.run_bugzilla_tool(["clean-build", self.port.flag(), "--force-clean", "--quiet", "--ignore-builders"]) shouldn't need --ignore builders, no? why would "build" ever look at builders? I'm not sure that build-attachment needs to look at builders either. Maybe it should. Although it seems like you don't really want "build-attachment" here so much as you want an apply step, followed by a build step. We seem to be conflating two problems. 1. the need to run in a separate process. 2. the want to control whcih specific steps are run. Let's talk in person. error is evil! 39 from modules.logging import error, log, tee There is already a --no-update flag elsewhere: 81 make_option("--no-update", action="store_false", dest="update", default=True, help="Do not update the working copy."), perhaps we should just copy or move that one? 165452 3 43613 abarth 2009-11-20 14:33:01 -0800 Created attachment 43613 Patch 165453 4 abarth 2009-11-20 14:34:26 -0800 (In reply to comment #2) > (From update of attachment 43612 [details]) > "clean" build is overloaded. Not what you want. > > Probably just "build" Fixed. > 152 Command.__init__(self, "Updates working copy and does a clean > build.", "tt", options) Fixed. > 790 self.run_bugzilla_tool(["clean-build", self.port.flag(), > "--force-clean", "--quiet", "--ignore-builders"]) > > shouldn't need --ignore builders, no? why would "build" ever look at builders? Removed. I'm inclined to solve the "looking at the builders too much" problem in a separate patch. > error is evil! > 39 from modules.logging import error, log, tee This actually an unrelated bug fix. > There is already a --no-update flag elsewhere: > 81 make_option("--no-update", action="store_false", dest="update", > default=True, help="Do not update the working copy."), > > perhaps we should just copy or move that one? I copied the text. I'll unify this soon. 165459 5 43613 eric 2009-11-20 14:44:49 -0800 Comment on attachment 43613 Patch 792 return (False, "Unable to perform a clean build.", None) 152 Command.__init__(self, "Updates working copy and does a clean build.", "", options) You and clean. OK. Needs fix for landing. 165460 6 43615 abarth 2009-11-20 14:46:57 -0800 Created attachment 43615 2009-11-20 Adam Barth <abarth@webkit.org> 165465 7 43615 abarth 2009-11-20 14:52:58 -0800 Comment on attachment 43615 2009-11-20 Adam Barth <abarth@webkit.org> Clearing flags on attachment: 43615 Committed r51260: <http://trac.webkit.org/changeset/51260> 165466 8 abarth 2009-11-20 14:53:06 -0800 All reviewed patches have been landed. Closing bug. 43612 2009-11-20 14:09:02 -0800 2009-11-20 14:32:54 -0800 Patch bug-31744-20091120140901.patch text/plain 4771 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0OTUyODdmLi5kNTEyOThiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTcgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBCdWlsZFF1ZXVlIHNob3Vs ZCBjaGVjayBpZiB0aGUgdHJlZSBpcyBjdXJyZW50bHkgYnVpbGRhYmxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTc0NAorCisgICAgICAgICogU2Ny aXB0cy9idWd6aWxsYS10b29sOgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9sYW5kaW5nc2Vx dWVuY2UucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3dlYmtpdGxhbmRpbmdzY3JpcHRz LnB5OgorCisyMDA5LTExLTIwICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgTW92ZSBwcmVwYXJl X2NsZWFuX3dvcmtpbmdfZGlyZWN0b3J5IGludG8gdGhlIExhbmRpbmdTZXF1ZW5jZQogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3NDMKIApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9idWd6aWxsYS10b29sCmluZGV4IGEyN2IwN2MuLmM5YzVmNTggMTAwNzU1Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L2J1Z3ppbGxhLXRvb2wKQEAgLTEzMyw2ICsxMzMsMjkgQEAgY2xhc3MgQ2hlY2tTdHlsZShDb21t YW5kKToKICAgICAgICAgc2VsZi5jaGVja19zdHlsZShhdHRhY2htZW50LCBvcHRpb25zLCB0b29s KQogCiAKK2NsYXNzIENsZWFuQnVpbGRTZXF1ZW5jZShDb25kaXRpb25hbExhbmRpbmdTZXF1ZW5j ZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG9wdGlvbnMsIHRvb2wpOgorICAgICAgICBDb25k aXRpb25hbExhbmRpbmdTZXF1ZW5jZS5fX2luaXRfXyhzZWxmLCBOb25lLCBvcHRpb25zLCB0b29s KQorCisgICAgZGVmIHJ1bihzZWxmKToKKyAgICAgICAgc2VsZi5jbGVhbigpCisgICAgICAgIHNl bGYudXBkYXRlKCkKKyAgICAgICAgc2VsZi5idWlsZCgpCisKKworY2xhc3MgQ2xlYW5CdWlsZChD b21tYW5kKToKKyAgICBuYW1lID0gImNsZWFuLWJ1aWxkIgorICAgIGRlZiBfX2luaXRfXyhzZWxm KToKKyAgICAgICAgb3B0aW9ucyA9IFdlYktpdExhbmRpbmdTY3JpcHRzLmNsZWFuaW5nX29wdGlv bnMoKQorICAgICAgICBvcHRpb25zICs9IFdlYktpdExhbmRpbmdTY3JpcHRzLmJ1aWxkX29wdGlv bnMoKQorICAgICAgICBvcHRpb25zICs9IFdlYktpdExhbmRpbmdTY3JpcHRzLmxhbmRfb3B0aW9u cygpCisgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIlVwZGF0ZXMgd29ya2luZyBjb3B5 IGFuZCBkb2VzIGEgY2xlYW4gYnVpbGQuIiwgInR0Iiwgb3B0aW9ucykKKworICAgIGRlZiBleGVj dXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICBzZXF1ZW5jZSA9IENsZWFu QnVpbGRTZXF1ZW5jZShvcHRpb25zLCB0b29sKQorICAgICAgICBzZXF1ZW5jZS5ydW5fYW5kX2hh bmRsZV9lcnJvcnMoKQorCisKIGNsYXNzIEFwcGx5QXR0YWNobWVudChDb21tYW5kKToKICAgICBu YW1lID0gImFwcGx5LWF0dGFjaG1lbnQiCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgpAQCAtNzYz LDExICs3ODYsMTQgQEAgY2xhc3MgQnVpbGRRdWV1ZShBYnN0cmFjdFRyeVF1ZXVlKToKICAgICAg ICAgc2VsZi5wb3J0ID0gV2ViS2l0UG9ydC5wb3J0KHNlbGYub3B0aW9ucykKIAogICAgIGRlZiBz aG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbShzZWxmLCBwYXRjaCk6Ci0gICAgICAgICMgRklY TUU6IFdlIHNob3VsZCBjaGVjayB3aGV0aGVyIHdlJ3JlIGN1cnJlbnRseSBhYmxlIHRvIGJ1aWxk IQorICAgICAgICB0cnk6CisgICAgICAgICAgICBzZWxmLnJ1bl9idWd6aWxsYV90b29sKFsiY2xl YW4tYnVpbGQiLCBzZWxmLnBvcnQuZmxhZygpLCAiLS1mb3JjZS1jbGVhbiIsICItLXF1aWV0Iiwg Ii0taWdub3JlLWJ1aWxkZXJzIl0pCisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAg ICAgICAgICAgIHJldHVybiAoRmFsc2UsICJVbmFibGUgdG8gcGVyZm9ybSBhIGNsZWFuIGJ1aWxk LiIsIE5vbmUpCiAgICAgICAgIHJldHVybiAoVHJ1ZSwgIkJ1aWxkaW5nIHBhdGNoICVzIG9uIGJ1 ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaFsiYnVnX2lkIl0p CiAKICAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgotICAgICAgICBzZWxm LnJ1bl9idWd6aWxsYV90b29sKFsiYnVpbGQtYXR0YWNobWVudCIsIHNlbGYucG9ydC5mbGFnKCks ICItLWZvcmNlLWNsZWFuIiwgcGF0Y2hbImlkIl1dKQorICAgICAgICBzZWxmLnJ1bl9idWd6aWxs YV90b29sKFsiYnVpbGQtYXR0YWNobWVudCIsIHNlbGYucG9ydC5mbGFnKCksICItLWZvcmNlLWNs ZWFuIiwgIi0tcXVpZXQiLCAiLS1pZ25vcmUtYnVpbGRlcnMiLCAiLS1uby11cGRhdGUiLCBwYXRj aFsiaWQiXV0pCiAKIAogY2xhc3MgQnVnemlsbGFUb29sKE11bHRpQ29tbWFuZFRvb2wpOgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2xhbmRpbmdzZXF1ZW5jZS5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9sYW5kaW5nc2VxdWVuY2UucHkKaW5kZXggNGRh YmNiYy4uZWYxMjc1MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2xh bmRpbmdzZXF1ZW5jZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbGFuZGlu Z3NlcXVlbmNlLnB5CkBAIC0xMTEsNiArMTExLDEwIEBAIGNsYXNzIENvbmRpdGlvbmFsTGFuZGlu Z1NlcXVlbmNlKExhbmRpbmdTZXF1ZW5jZSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGNo LCBvcHRpb25zLCB0b29sKToKICAgICAgICAgTGFuZGluZ1NlcXVlbmNlLl9faW5pdF9fKHNlbGYs IHBhdGNoLCBvcHRpb25zLCB0b29sKQogCisgICAgZGVmIHVwZGF0ZShzZWxmKToKKyAgICAgICAg aWYgc2VsZi5fb3B0aW9ucy51cGRhdGU6CisgICAgICAgICAgICBMYW5kaW5nU2VxdWVuY2UudXBk YXRlKHNlbGYpCisKICAgICBkZWYgYnVpbGQoc2VsZik6CiAgICAgICAgIGlmIHNlbGYuX29wdGlv bnMuYnVpbGQ6CiAgICAgICAgICAgICBMYW5kaW5nU2VxdWVuY2UuYnVpbGQoc2VsZikKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRsYW5kaW5nc2NyaXB0cy5w eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRsYW5kaW5nc2NyaXB0cy5weQpp bmRleCA4N2JjYzRkLi40NDA2NWM0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvd2Via2l0bGFuZGluZ3NjcmlwdHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL3dlYmtpdGxhbmRpbmdzY3JpcHRzLnB5CkBAIC0zNiw3ICszNiw3IEBAIGltcG9ydCBz eXMKIGZyb20gb3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9uCiAKIGZyb20gbW9kdWxlcy5jaGFu Z2Vsb2dzIGltcG9ydCBDaGFuZ2VMb2cKLWZyb20gbW9kdWxlcy5sb2dnaW5nIGltcG9ydCBsb2cs IHRlZQorZnJvbSBtb2R1bGVzLmxvZ2dpbmcgaW1wb3J0IGVycm9yLCBsb2csIHRlZQogZnJvbSBt b2R1bGVzLnNjbSBpbXBvcnQgQ29tbWl0TWVzc2FnZSwgZGV0ZWN0X3NjbV9zeXN0ZW0sIFNjcmlw dEVycm9yLCBDaGVja291dE5lZWRzVXBkYXRlCiBmcm9tIG1vZHVsZXMud2Via2l0cG9ydCBpbXBv cnQgV2ViS2l0UG9ydAogCkBAIC03OCw5ICs3OCwxMCBAQCBjbGFzcyBXZWJLaXRMYW5kaW5nU2Ny aXB0czoKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGxhbmRfb3B0aW9ucygpOgogICAgICAg ICByZXR1cm4gWwotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tY2xvc2UiLCBhY3Rpb249 InN0b3JlX2ZhbHNlIiwgZGVzdD0iY2xvc2VfYnVnIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJMZWF2 ZSBidWcgb3BlbiBhZnRlciBsYW5kaW5nLiIpLAorICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0t bm8tdXBkYXRlIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InVwZGF0ZSIsIGRlZmF1bHQ9 VHJ1ZSwgaGVscD0iRG8gbm90IHVwZGF0ZSB0aGUgd29ya2luZyBjb3B5LiIpLAogICAgICAgICAg ICAgbWFrZV9vcHRpb24oIi0tbm8tYnVpbGQiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0i YnVpbGQiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkNvbW1pdCB3aXRob3V0IGJ1aWxkaW5nIGZpcnN0 LCBpbXBsaWVzIC0tbm8tdGVzdC4iKSwKICAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLXRl c3QiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0idGVzdCIsIGRlZmF1bHQ9VHJ1ZSwgaGVs cD0iQ29tbWl0IHdpdGhvdXQgcnVubmluZyBydW4td2Via2l0LXRlc3RzLiIpLAorICAgICAgICAg ICAgbWFrZV9vcHRpb24oIi0tbm8tY2xvc2UiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0i Y2xvc2VfYnVnIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJMZWF2ZSBidWcgb3BlbiBhZnRlciBsYW5k aW5nLiIpLAogICAgICAgICBdCiAKICAgICBAc3RhdGljbWV0aG9kCg== 43613 2009-11-20 14:33:01 -0800 2009-11-20 14:46:53 -0800 Patch bug-31744-20091120143300.patch text/plain 4704 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0OTUyODdmLi5kNTEyOThiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTcgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBCdWlsZFF1ZXVlIHNob3Vs ZCBjaGVjayBpZiB0aGUgdHJlZSBpcyBjdXJyZW50bHkgYnVpbGRhYmxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTc0NAorCisgICAgICAgICogU2Ny aXB0cy9idWd6aWxsYS10b29sOgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9sYW5kaW5nc2Vx dWVuY2UucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3dlYmtpdGxhbmRpbmdzY3JpcHRz LnB5OgorCisyMDA5LTExLTIwICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgTW92ZSBwcmVwYXJl X2NsZWFuX3dvcmtpbmdfZGlyZWN0b3J5IGludG8gdGhlIExhbmRpbmdTZXF1ZW5jZQogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3NDMKIApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9idWd6aWxsYS10b29sCmluZGV4IGEyN2IwN2MuLmVlZmE5Y2EgMTAwNzU1Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L2J1Z3ppbGxhLXRvb2wKQEAgLTEzMyw2ICsxMzMsMjkgQEAgY2xhc3MgQ2hlY2tTdHlsZShDb21t YW5kKToKICAgICAgICAgc2VsZi5jaGVja19zdHlsZShhdHRhY2htZW50LCBvcHRpb25zLCB0b29s KQogCiAKK2NsYXNzIEJ1aWxkU2VxdWVuY2UoQ29uZGl0aW9uYWxMYW5kaW5nU2VxdWVuY2UpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBvcHRpb25zLCB0b29sKToKKyAgICAgICAgQ29uZGl0aW9u YWxMYW5kaW5nU2VxdWVuY2UuX19pbml0X18oc2VsZiwgTm9uZSwgb3B0aW9ucywgdG9vbCkKKwor ICAgIGRlZiBydW4oc2VsZik6CisgICAgICAgIHNlbGYuY2xlYW4oKQorICAgICAgICBzZWxmLnVw ZGF0ZSgpCisgICAgICAgIHNlbGYuYnVpbGQoKQorCisKK2NsYXNzIEJ1aWxkKENvbW1hbmQpOgor ICAgIG5hbWUgPSAiYnVpbGQiCisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAgICAgICBvcHRp b25zID0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygpCisgICAgICAgIG9w dGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuYnVpbGRfb3B0aW9ucygpCisgICAgICAgIG9w dGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMubGFuZF9vcHRpb25zKCkKKyAgICAgICAgQ29t bWFuZC5fX2luaXRfXyhzZWxmLCAiVXBkYXRlcyB3b3JraW5nIGNvcHkgYW5kIGRvZXMgYSBjbGVh biBidWlsZC4iLCAiIiwgb3B0aW9ucykKKworICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMs IGFyZ3MsIHRvb2wpOgorICAgICAgICBzZXF1ZW5jZSA9IEJ1aWxkU2VxdWVuY2Uob3B0aW9ucywg dG9vbCkKKyAgICAgICAgc2VxdWVuY2UucnVuX2FuZF9oYW5kbGVfZXJyb3JzKCkKKworCiBjbGFz cyBBcHBseUF0dGFjaG1lbnQoQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJhcHBseS1hdHRhY2htZW50 IgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKQEAgLTc2MywxMSArNzg2LDE0IEBAIGNsYXNzIEJ1 aWxkUXVldWUoQWJzdHJhY3RUcnlRdWV1ZSk6CiAgICAgICAgIHNlbGYucG9ydCA9IFdlYktpdFBv cnQucG9ydChzZWxmLm9wdGlvbnMpCiAKICAgICBkZWYgc2hvdWxkX3Byb2NlZWRfd2l0aF93b3Jr X2l0ZW0oc2VsZiwgcGF0Y2gpOgotICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgY2hlY2sgd2hl dGhlciB3ZSdyZSBjdXJyZW50bHkgYWJsZSB0byBidWlsZCEKKyAgICAgICAgdHJ5OgorICAgICAg ICAgICAgc2VsZi5ydW5fYnVnemlsbGFfdG9vbChbImJ1aWxkIiwgc2VsZi5wb3J0LmZsYWcoKSwg Ii0tZm9yY2UtY2xlYW4iLCAiLS1xdWlldCJdKQorICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3Is IGU6CisgICAgICAgICAgICByZXR1cm4gKEZhbHNlLCAiVW5hYmxlIHRvIHBlcmZvcm0gYSBjbGVh biBidWlsZC4iLCBOb25lKQogICAgICAgICByZXR1cm4gKFRydWUsICJCdWlsZGluZyBwYXRjaCAl cyBvbiBidWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJdKSwgcGF0Y2hbImJ1 Z19pZCJdKQogCiAgICAgZGVmIHByb2Nlc3Nfd29ya19pdGVtKHNlbGYsIHBhdGNoKToKLSAgICAg ICAgc2VsZi5ydW5fYnVnemlsbGFfdG9vbChbImJ1aWxkLWF0dGFjaG1lbnQiLCBzZWxmLnBvcnQu ZmxhZygpLCAiLS1mb3JjZS1jbGVhbiIsIHBhdGNoWyJpZCJdXSkKKyAgICAgICAgc2VsZi5ydW5f YnVnemlsbGFfdG9vbChbImJ1aWxkLWF0dGFjaG1lbnQiLCBzZWxmLnBvcnQuZmxhZygpLCAiLS1m b3JjZS1jbGVhbiIsICItLXF1aWV0IiwgIi0tbm8tdXBkYXRlIiwgcGF0Y2hbImlkIl1dKQogCiAK IGNsYXNzIEJ1Z3ppbGxhVG9vbChNdWx0aUNvbW1hbmRUb29sKToKZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9sYW5kaW5nc2VxdWVuY2UucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvbGFuZGluZ3NlcXVlbmNlLnB5CmluZGV4IDRkYWJjYmMuLmVmMTI3NTMg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9sYW5kaW5nc2VxdWVuY2Uu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2xhbmRpbmdzZXF1ZW5jZS5weQpA QCAtMTExLDYgKzExMSwxMCBAQCBjbGFzcyBDb25kaXRpb25hbExhbmRpbmdTZXF1ZW5jZShMYW5k aW5nU2VxdWVuY2UpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwYXRjaCwgb3B0aW9ucywgdG9v bCk6CiAgICAgICAgIExhbmRpbmdTZXF1ZW5jZS5fX2luaXRfXyhzZWxmLCBwYXRjaCwgb3B0aW9u cywgdG9vbCkKIAorICAgIGRlZiB1cGRhdGUoc2VsZik6CisgICAgICAgIGlmIHNlbGYuX29wdGlv bnMudXBkYXRlOgorICAgICAgICAgICAgTGFuZGluZ1NlcXVlbmNlLnVwZGF0ZShzZWxmKQorCiAg ICAgZGVmIGJ1aWxkKHNlbGYpOgogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmJ1aWxkOgogICAg ICAgICAgICAgTGFuZGluZ1NlcXVlbmNlLmJ1aWxkKHNlbGYpCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvd2Via2l0bGFuZGluZ3NjcmlwdHMucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvd2Via2l0bGFuZGluZ3NjcmlwdHMucHkKaW5kZXggODdiY2M0ZC4u ZTYyNDUwNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dlYmtpdGxh bmRpbmdzY3JpcHRzLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRs YW5kaW5nc2NyaXB0cy5weQpAQCAtMzYsNyArMzYsNyBAQCBpbXBvcnQgc3lzCiBmcm9tIG9wdHBh cnNlIGltcG9ydCBtYWtlX29wdGlvbgogCiBmcm9tIG1vZHVsZXMuY2hhbmdlbG9ncyBpbXBvcnQg Q2hhbmdlTG9nCi1mcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQgbG9nLCB0ZWUKK2Zyb20gbW9k dWxlcy5sb2dnaW5nIGltcG9ydCBlcnJvciwgbG9nLCB0ZWUKIGZyb20gbW9kdWxlcy5zY20gaW1w b3J0IENvbW1pdE1lc3NhZ2UsIGRldGVjdF9zY21fc3lzdGVtLCBTY3JpcHRFcnJvciwgQ2hlY2tv dXROZWVkc1VwZGF0ZQogZnJvbSBtb2R1bGVzLndlYmtpdHBvcnQgaW1wb3J0IFdlYktpdFBvcnQK IApAQCAtNzgsOSArNzgsMTAgQEAgY2xhc3MgV2ViS2l0TGFuZGluZ1NjcmlwdHM6CiAgICAgQHN0 YXRpY21ldGhvZAogICAgIGRlZiBsYW5kX29wdGlvbnMoKToKICAgICAgICAgcmV0dXJuIFsKLSAg ICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLWNsb3NlIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIs IGRlc3Q9ImNsb3NlX2J1ZyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iTGVhdmUgYnVnIG9wZW4gYWZ0 ZXIgbGFuZGluZy4iKSwKKyAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLXVwZGF0ZSIsIGFj dGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJ1cGRhdGUiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkRv bid0IHVwZGF0ZSB0aGUgd29ya2luZyBkaXJlY3RvcnkuIiksCiAgICAgICAgICAgICBtYWtlX29w dGlvbigiLS1uby1idWlsZCIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJidWlsZCIsIGRl ZmF1bHQ9VHJ1ZSwgaGVscD0iQ29tbWl0IHdpdGhvdXQgYnVpbGRpbmcgZmlyc3QsIGltcGxpZXMg LS1uby10ZXN0LiIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tdGVzdCIsIGFjdGlv bj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJ0ZXN0IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQg d2l0aG91dCBydW5uaW5nIHJ1bi13ZWJraXQtdGVzdHMuIiksCisgICAgICAgICAgICBtYWtlX29w dGlvbigiLS1uby1jbG9zZSIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJjbG9zZV9idWci LCBkZWZhdWx0PVRydWUsIGhlbHA9IkxlYXZlIGJ1ZyBvcGVuIGFmdGVyIGxhbmRpbmcuIiksCiAg ICAgICAgIF0KIAogICAgIEBzdGF0aWNtZXRob2QK 43615 2009-11-20 14:46:57 -0800 2009-11-20 14:52:58 -0800 2009-11-20 Adam Barth <abarth@webkit.org> bug-31744-20091120144656.patch text/plain 4766 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0OTUyODdmLi5kNzA0ODZjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDYgKzEsMTcgQEAKIDIwMDktMTEt MjAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAotICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAg ICAgICAgQnVpbGRRdWV1ZSBzaG91bGQgY2hlY2sgaWYgdGhlIHRyZWUgaXMgY3VycmVudGx5IGJ1 aWxkYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzE3NDQKKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgKiBTY3Jp cHRzL21vZHVsZXMvbGFuZGluZ3NlcXVlbmNlLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxl cy93ZWJraXRsYW5kaW5nc2NyaXB0cy5weToKKworMjAwOS0xMS0yMCAgQWRhbSBCYXJ0aCAgPGFi YXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgogCiAg ICAgICAgIE1vdmUgcHJlcGFyZV9jbGVhbl93b3JraW5nX2RpcmVjdG9yeSBpbnRvIHRoZSBMYW5k aW5nU2VxdWVuY2UKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTMxNzQzCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wg Yi9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKaW5kZXggYTI3YjA3Yy4uZDA1N2E1 ZSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbApAQCAtMTMzLDYgKzEzMywyOSBAQCBjbGFz cyBDaGVja1N0eWxlKENvbW1hbmQpOgogICAgICAgICBzZWxmLmNoZWNrX3N0eWxlKGF0dGFjaG1l bnQsIG9wdGlvbnMsIHRvb2wpCiAKIAorY2xhc3MgQnVpbGRTZXF1ZW5jZShDb25kaXRpb25hbExh bmRpbmdTZXF1ZW5jZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG9wdGlvbnMsIHRvb2wpOgor ICAgICAgICBDb25kaXRpb25hbExhbmRpbmdTZXF1ZW5jZS5fX2luaXRfXyhzZWxmLCBOb25lLCBv cHRpb25zLCB0b29sKQorCisgICAgZGVmIHJ1bihzZWxmKToKKyAgICAgICAgc2VsZi5jbGVhbigp CisgICAgICAgIHNlbGYudXBkYXRlKCkKKyAgICAgICAgc2VsZi5idWlsZCgpCisKKworY2xhc3Mg QnVpbGQoQ29tbWFuZCk6CisgICAgbmFtZSA9ICJidWlsZCIKKyAgICBkZWYgX19pbml0X18oc2Vs Zik6CisgICAgICAgIG9wdGlvbnMgPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRp b25zKCkKKyAgICAgICAgb3B0aW9ucyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9vcHRp b25zKCkKKyAgICAgICAgb3B0aW9ucyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5sYW5kX29wdGlv bnMoKQorICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICJVcGRhdGVzIHdvcmtpbmcgY29w eSBhbmQgZG9lcyBhIGJ1aWxkLiIsICIiLCBvcHRpb25zKQorCisgICAgZGVmIGV4ZWN1dGUoc2Vs Ziwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIHNlcXVlbmNlID0gQnVpbGRTZXF1ZW5j ZShvcHRpb25zLCB0b29sKQorICAgICAgICBzZXF1ZW5jZS5ydW5fYW5kX2hhbmRsZV9lcnJvcnMo KQorCisKIGNsYXNzIEFwcGx5QXR0YWNobWVudChDb21tYW5kKToKICAgICBuYW1lID0gImFwcGx5 LWF0dGFjaG1lbnQiCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgpAQCAtNzYzLDExICs3ODYsMTQg QEAgY2xhc3MgQnVpbGRRdWV1ZShBYnN0cmFjdFRyeVF1ZXVlKToKICAgICAgICAgc2VsZi5wb3J0 ID0gV2ViS2l0UG9ydC5wb3J0KHNlbGYub3B0aW9ucykKIAogICAgIGRlZiBzaG91bGRfcHJvY2Vl ZF93aXRoX3dvcmtfaXRlbShzZWxmLCBwYXRjaCk6Ci0gICAgICAgICMgRklYTUU6IFdlIHNob3Vs ZCBjaGVjayB3aGV0aGVyIHdlJ3JlIGN1cnJlbnRseSBhYmxlIHRvIGJ1aWxkIQorICAgICAgICB0 cnk6CisgICAgICAgICAgICBzZWxmLnJ1bl9idWd6aWxsYV90b29sKFsiYnVpbGQiLCBzZWxmLnBv cnQuZmxhZygpLCAiLS1mb3JjZS1jbGVhbiIsICItLXF1aWV0Il0pCisgICAgICAgIGV4Y2VwdCBT Y3JpcHRFcnJvciwgZToKKyAgICAgICAgICAgIHJldHVybiAoRmFsc2UsICJVbmFibGUgdG8gcGVy Zm9ybSBhIGJ1aWxkLiIsIE5vbmUpCiAgICAgICAgIHJldHVybiAoVHJ1ZSwgIkJ1aWxkaW5nIHBh dGNoICVzIG9uIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRj aFsiYnVnX2lkIl0pCiAKICAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgot ICAgICAgICBzZWxmLnJ1bl9idWd6aWxsYV90b29sKFsiYnVpbGQtYXR0YWNobWVudCIsIHNlbGYu cG9ydC5mbGFnKCksICItLWZvcmNlLWNsZWFuIiwgcGF0Y2hbImlkIl1dKQorICAgICAgICBzZWxm LnJ1bl9idWd6aWxsYV90b29sKFsiYnVpbGQtYXR0YWNobWVudCIsIHNlbGYucG9ydC5mbGFnKCks ICItLWZvcmNlLWNsZWFuIiwgIi0tcXVpZXQiLCAiLS1uby11cGRhdGUiLCBwYXRjaFsiaWQiXV0p CiAKIAogY2xhc3MgQnVnemlsbGFUb29sKE11bHRpQ29tbWFuZFRvb2wpOgpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2xhbmRpbmdzZXF1ZW5jZS5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9sYW5kaW5nc2VxdWVuY2UucHkKaW5kZXggNGRhYmNiYy4uZWYx Mjc1MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2xhbmRpbmdzZXF1 ZW5jZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbGFuZGluZ3NlcXVlbmNl LnB5CkBAIC0xMTEsNiArMTExLDEwIEBAIGNsYXNzIENvbmRpdGlvbmFsTGFuZGluZ1NlcXVlbmNl KExhbmRpbmdTZXF1ZW5jZSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGNoLCBvcHRpb25z LCB0b29sKToKICAgICAgICAgTGFuZGluZ1NlcXVlbmNlLl9faW5pdF9fKHNlbGYsIHBhdGNoLCBv cHRpb25zLCB0b29sKQogCisgICAgZGVmIHVwZGF0ZShzZWxmKToKKyAgICAgICAgaWYgc2VsZi5f b3B0aW9ucy51cGRhdGU6CisgICAgICAgICAgICBMYW5kaW5nU2VxdWVuY2UudXBkYXRlKHNlbGYp CisKICAgICBkZWYgYnVpbGQoc2VsZik6CiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuYnVpbGQ6 CiAgICAgICAgICAgICBMYW5kaW5nU2VxdWVuY2UuYnVpbGQoc2VsZikKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRsYW5kaW5nc2NyaXB0cy5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRsYW5kaW5nc2NyaXB0cy5weQppbmRleCA4N2Jj YzRkLi5lNjI0NTA1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd2Vi a2l0bGFuZGluZ3NjcmlwdHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dl YmtpdGxhbmRpbmdzY3JpcHRzLnB5CkBAIC0zNiw3ICszNiw3IEBAIGltcG9ydCBzeXMKIGZyb20g b3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9uCiAKIGZyb20gbW9kdWxlcy5jaGFuZ2Vsb2dzIGlt cG9ydCBDaGFuZ2VMb2cKLWZyb20gbW9kdWxlcy5sb2dnaW5nIGltcG9ydCBsb2csIHRlZQorZnJv bSBtb2R1bGVzLmxvZ2dpbmcgaW1wb3J0IGVycm9yLCBsb2csIHRlZQogZnJvbSBtb2R1bGVzLnNj bSBpbXBvcnQgQ29tbWl0TWVzc2FnZSwgZGV0ZWN0X3NjbV9zeXN0ZW0sIFNjcmlwdEVycm9yLCBD aGVja291dE5lZWRzVXBkYXRlCiBmcm9tIG1vZHVsZXMud2Via2l0cG9ydCBpbXBvcnQgV2ViS2l0 UG9ydAogCkBAIC03OCw5ICs3OCwxMCBAQCBjbGFzcyBXZWJLaXRMYW5kaW5nU2NyaXB0czoKICAg ICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGxhbmRfb3B0aW9ucygpOgogICAgICAgICByZXR1cm4g WwotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tY2xvc2UiLCBhY3Rpb249InN0b3JlX2Zh bHNlIiwgZGVzdD0iY2xvc2VfYnVnIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJMZWF2ZSBidWcgb3Bl biBhZnRlciBsYW5kaW5nLiIpLAorICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tdXBkYXRl IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InVwZGF0ZSIsIGRlZmF1bHQ9VHJ1ZSwgaGVs cD0iRG9uJ3QgdXBkYXRlIHRoZSB3b3JraW5nIGRpcmVjdG9yeS4iKSwKICAgICAgICAgICAgIG1h a2Vfb3B0aW9uKCItLW5vLWJ1aWxkIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImJ1aWxk IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQgd2l0aG91dCBidWlsZGluZyBmaXJzdCwgaW1w bGllcyAtLW5vLXRlc3QuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby10ZXN0Iiwg YWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InRlc3QiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkNv bW1pdCB3aXRob3V0IHJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cy4iKSwKKyAgICAgICAgICAgIG1h a2Vfb3B0aW9uKCItLW5vLWNsb3NlIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNsb3Nl X2J1ZyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iTGVhdmUgYnVnIG9wZW4gYWZ0ZXIgbGFuZGluZy4i KSwKICAgICAgICAgXQogCiAgICAgQHN0YXRpY21ldGhvZAo=