33070 2009-12-30 23:18:56 -0800 [bzt] Make it easier to run submit-patch when previous run cancelled 2010-01-03 23:08:20 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned eric webkit.review.bot oldest_to_newest 176126 0 abarth 2009-12-30 23:18:56 -0800 [bzt] Make it easier to run submit-patch when previous run cancelled 176127 1 45698 abarth 2009-12-30 23:22:19 -0800 Created attachment 45698 Patch 176128 2 webkit.review.bot 2009-12-30 23:23:51 -0800 style-queue ran check-webkit-style on attachment 45698 without any errors. 176129 3 45699 abarth 2009-12-30 23:24:44 -0800 Created attachment 45699 Patch 176131 4 webkit.review.bot 2009-12-30 23:29:14 -0800 style-queue ran check-webkit-style on attachment 45699 without any errors. 176531 5 45699 eric 2010-01-03 22:52:21 -0800 Comment on attachment 45699 Patch Looks sane. 176535 6 abarth 2010-01-03 23:08:20 -0800 Committed r52704: <http://trac.webkit.org/changeset/52704> 45698 2009-12-30 23:22:19 -0800 2009-12-30 23:24:41 -0800 Patch bug-33070-20091230232218.patch text/plain 10531 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0ZDJmY2I4Li44MGNiMzdlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMDktMTIt MzAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbYnp0XSBNYWtlIGl0IGVhc2llciB0byBydW4g c3VibWl0LXBhdGNoIHdoZW4gcHJldmlvdXMgcnVuIGNhbmNlbGxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMwNzAKKworICAgICAgICBUaGlzIHBh dGNoIHJlbmFtZXMgY3JlYXRlLXJldmlldyB0byBzdWJtaXQtcGF0Y2ggKGFzIHJlcXVlc3RlZCBi eQorICAgICAgICBNYWNpZWopLgorCisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgaXQgZWFzaWVy IHRvIHJ1biBzdWJtaXQtcGF0Y2ggYWZ0ZXIgdGhlIHVzZXIgaGFzCisgICAgICAgIGFscmVhZHkg Y2FuY2VsbGVkIGEgcHJldmlvdXMgcnVuIG9mIHN1Ym1pdC1wYXRjaCBieSBkZXRlY3Rpbmcgd2hl biB3ZQorICAgICAgICBhbHJlYWR5IGhhdmUgQ2hhbmdlTG9ncyBhbmQgcmVhZGluZyB0aGUgYnVn IG51bWJlciBmcm9tIHRoZW0gKGFuZCBub3QKKyAgICAgICAgYXR0ZW1wdGluZyB0byByZWNyZWF0 ZSB0aGVtKS4gIEFzaWRlIGZyb20gcGVyZm9ybWFuY2UgYW5kIHRoZSBleHRyYQorICAgICAgICBl ZGl0IHN0ZXAsIHRoaXMgY29tbWFuZCBzaG91bGQgbm90IHN1YnN1bWUgcG9zdC1kaWYuCisKKyAg ICAgICAgQWxzbywgYWRkZWQgYSAtLWVtYWlsIGNvbW1hbmQgbGluZSBhcmd1bWVudCBzbyB0aGF0 IHRoZSBvdXRwdXQgb2YKKyAgICAgICAgcHJlcGFyZS1DaGFuZ2VMb2cgbWFrZXMgc2Vuc2Ugd2hl biBpdCBjYW4ndCBmaW5kIHRoZSB1c2VyJ3MgZW1haWwKKyAgICAgICAgYWRkcmVzcy4KKworICAg ICAgICAqIFNjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weToKKyAgICAgICAgKiBTY3JpcHRzL21v ZHVsZXMvYnVpbGRzdGVwcy5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMv dXBsb2FkLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5p dHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5 OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy91c2VyLnB5OgorCiAyMDA5LTEyLTMwICBLZXZp biBXYXR0ZXJzICA8a2V2aW53YXR0ZXJzQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBLZXZpbiBPbGxpdmllci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQpp bmRleCBiNDQzNTMzLi5hNjBmMGY0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvYnVnemlsbGEucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3pp bGxhLnB5CkBAIC0zNTEsNyArMzUxLDcgQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0KToKIAogICAg IGRlZiBhZGRfcGF0Y2hfdG9fYnVnKHNlbGYsIGJ1Z19pZCwgcGF0Y2hfZmlsZV9vYmplY3QsIGRl c2NyaXB0aW9uLCBjb21tZW50X3RleHQ9Tm9uZSwgbWFya19mb3JfcmV2aWV3PUZhbHNlLCBtYXJr X2Zvcl9jb21taXRfcXVldWU9RmFsc2UpOgogICAgICAgICBzZWxmLmF1dGhlbnRpY2F0ZSgpCi0g ICAgICAgIAorCiAgICAgICAgIGxvZygnQWRkaW5nIHBhdGNoICIlcyIgdG8gYnVnICVzJyAlIChk ZXNjcmlwdGlvbiwgYnVnX2lkKSkKICAgICAgICAgaWYgc2VsZi5kcnlydW46CiAgICAgICAgICAg ICBsb2coY29tbWVudF90ZXh0KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL2J1aWxkc3RlcHMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVpbGRzdGVw cy5weQppbmRleCBmMzc1NDE1Li4xZmYzNDgwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvYnVpbGRzdGVwcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvYnVpbGRzdGVwcy5weQpAQCAtODYsNiArODYsNyBAQCBjbGFzcyBDb21tYW5kT3B0aW9ucyhv YmplY3QpOgogICAgIGNjID0gbWFrZV9vcHRpb24oIi0tY2MiLCBhY3Rpb249InN0b3JlIiwgdHlw ZT0ic3RyaW5nIiwgZGVzdD0iY2MiLCBoZWxwPSJDb21tYS1zZXBhcmF0ZWQgbGlzdCBvZiBlbWFp bCBhZGRyZXNzZXMgdG8gY2FyYm9uLWNvcHkuIikKICAgICBjb21wb25lbnQgPSBtYWtlX29wdGlv bigiLS1jb21wb25lbnQiLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3RyaW5nIiwgZGVzdD0iY29t cG9uZW50IiwgaGVscD0iQ29tcG9uZW50IGZvciB0aGUgbmV3IGJ1Zy4iKQogICAgIGNvbmZpcm0g PSBtYWtlX29wdGlvbigiLS1uby1jb25maXJtIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9 ImNvbmZpcm0iLCBkZWZhdWx0PVRydWUsIGhlbHA9IlNraXAgY29uZmlybWF0aW9uIHN0ZXBzLiIp CisgICAgZW1haWwgPSBtYWtlX29wdGlvbigiLS1lbWFpbCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBl PSJzdHJpbmciLCBkZXN0PSJlbWFpbCIsIGhlbHA9IkVtYWlsIGFkZHJlc3MgdG8gdXNlIGluIENo YW5nZUxvZ3MuIikKIAogCiBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKQEAgLTEwNiw2ICsx MDcsMTkgQEAgY2xhc3MgQWJzdHJhY3RTdGVwKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3BvcnQg PSBXZWJLaXRQb3J0LnBvcnQoc2VsZi5fb3B0aW9ucy5wb3J0KQogICAgICAgICByZXR1cm4gc2Vs Zi5fcG9ydAogCisgICAgX3dlbGxfa25vd25fa2V5cyA9IHsKKyAgICAgICAgImRpZmYiIDogbGFt YmRhIHNlbGY6IHNlbGYuX3Rvb2wuc2NtKCkuY3JlYXRlX3BhdGNoKCksCisgICAgICAgICJjaGFu Z2Vsb2dzIiA6IGxhbWJkYSBzZWxmOiBzZWxmLl90b29sLnNjbSgpLm1vZGlmaWVkX2NoYW5nZWxv Z3MoKSwKKyAgICB9CisKKyAgICBkZWYgY2FjaGVkX2xvb2t1cChzZWxmLCBzdGF0ZSwga2V5LCBw cm9taXNlPU5vbmUpOgorICAgICAgICBpZiBzdGF0ZS5nZXQoa2V5KToKKyAgICAgICAgICAgIHJl dHVybiBzdGF0ZVtrZXldCisgICAgICAgIGlmIG5vdCBwcm9taXNlOgorICAgICAgICAgICAgcHJv bWlzZSA9IHNlbGYuX3dlbGxfa25vd25fa2V5cy5nZXQoa2V5KQorICAgICAgICBzdGF0ZVtrZXld ID0gcHJvbWlzZShzZWxmKQorICAgICAgICByZXR1cm4gc3RhdGVba2V5XQorCiAgICAgQGNsYXNz bWV0aG9kCiAgICAgZGVmIG9wdGlvbnMoY2xzKToKICAgICAgICAgcmV0dXJuIFtdCkBAIC0xNzYs MTkgKzE5MCwyOCBAQCBjbGFzcyBQcmVwYXJlQ2hhbmdlTG9nU3RlcChBYnN0cmFjdFN0ZXApOgog ICAgICAgICByZXR1cm4gWwogICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMucG9ydCwKICAgICAg ICAgICAgIENvbW1hbmRPcHRpb25zLnF1aWV0LAorICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMu ZW1haWwsCiAgICAgICAgIF0KIAogICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgorICAgICAgICBp ZiBzZWxmLmNhY2hlZF9sb29rdXAoc3RhdGUsICJjaGFuZ2Vsb2dzIik6CisgICAgICAgICAgICBy ZXR1cm4KICAgICAgICAgb3MuY2hkaXIoc2VsZi5fdG9vbC5zY20oKS5jaGVja291dF9yb290KQog ICAgICAgICBhcmdzID0gW3NlbGYucG9ydCgpLnNjcmlwdF9wYXRoKCJwcmVwYXJlLUNoYW5nZUxv ZyIpXQogICAgICAgICBpZiBzdGF0ZVsiYnVnX2lkIl06CiAgICAgICAgICAgICBhcmdzLmFwcGVu ZCgiLS1idWc9JXMiICUgc3RhdGVbImJ1Z19pZCJdKQotICAgICAgICBzZWxmLl90b29sLmV4ZWN1 dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgc2VsZi5fb3B0aW9ucy5xdWlldCkKKyAg ICAgICAgaWYgc2VsZi5fb3B0aW9ucy5lbWFpbDoKKyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCIt LWVtYWlsPSVzIiAlIHNlbGYuX29wdGlvbnMuZW1haWwpCisgICAgICAgIHRyeToKKyAgICAgICAg ICAgIHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChhcmdzLCBzZWxm Ll9vcHRpb25zLnF1aWV0KQorICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6CisgICAgICAg ICAgICBlcnJvcigiVW5hYmxlIHRvIHByZXBhcmUgQ2hhbmdlTG9ncy4iKQorICAgICAgICBzdGF0 ZVsiZGlmZiJdID0gTm9uZSAjIFdlJ3ZlIGNoYW5nZWQgdGhlIGRpZmYKIAogCiBjbGFzcyBFZGl0 Q2hhbmdlTG9nU3RlcChBYnN0cmFjdFN0ZXApOgogICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgot ICAgICAgICBzZWxmLl90b29sLnVzZXIuZWRpdChzZWxmLl90b29sLnNjbSgpLm1vZGlmaWVkX2No YW5nZWxvZ3MoKSkKKyAgICAgICAgc2VsZi5fdG9vbC51c2VyLmVkaXQoc2VsZi5jYWNoZWRfbG9v a3VwKHN0YXRlLCAiY2hhbmdlbG9ncyIpKQogCiAKIGNsYXNzIE9ic29sZXRlUGF0Y2hlc09uQnVn U3RlcChBYnN0cmFjdFN0ZXApOgpAQCAtMjEwLDE2ICsyMzMsNyBAQCBjbGFzcyBPYnNvbGV0ZVBh dGNoZXNPbkJ1Z1N0ZXAoQWJzdHJhY3RTdGVwKToKICAgICAgICAgICAgIHNlbGYuX3Rvb2wuYnVn cy5vYnNvbGV0ZV9hdHRhY2htZW50KHBhdGNoWyJpZCJdKQogCiAKLWNsYXNzIEFic3RyYWN0RGlm ZlN0ZXAoQWJzdHJhY3RTdGVwKToKLSAgICBkZWYgZGlmZihzZWxmLCBzdGF0ZSk6Ci0gICAgICAg IGRpZmYgPSBzdGF0ZS5nZXQoImRpZmYiKQotICAgICAgICBpZiBub3QgZGlmZjoKLSAgICAgICAg ICAgIGRpZmYgPSBzZWxmLl90b29sLnNjbSgpLmNyZWF0ZV9wYXRjaCgpCi0gICAgICAgICAgICBz dGF0ZVsiZGlmZiJdID0gZGlmZgotICAgICAgICByZXR1cm4gZGlmZgotCi0KLWNsYXNzIENvbmZp cm1EaWZmU3RlcChBYnN0cmFjdERpZmZTdGVwKToKK2NsYXNzIENvbmZpcm1EaWZmU3RlcChBYnN0 cmFjdFN0ZXApOgogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBvcHRpb25zKGNscyk6CiAgICAg ICAgIHJldHVybiBbCkBAIC0yMjksMTMgKzI0MywxMyBAQCBjbGFzcyBDb25maXJtRGlmZlN0ZXAo QWJzdHJhY3REaWZmU3RlcCk6CiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6CiAgICAgICAgIGlm IG5vdCBzZWxmLl9vcHRpb25zLmNvbmZpcm06CiAgICAgICAgICAgICByZXR1cm4KLSAgICAgICAg ZGlmZiA9IHNlbGYuZGlmZihzdGF0ZSkKKyAgICAgICAgZGlmZiA9IHNlbGYuY2FjaGVkX2xvb2t1 cChzdGF0ZSwgImRpZmYiKQogICAgICAgICBzZWxmLl90b29sLnVzZXIucGFnZShkaWZmKQotICAg ICAgICBpZiBub3Qgc2VsZi5fdG9vbC51c2VyLmNvbmZpcm0oKToKKyAgICAgICAgaWYgbm90IHNl bGYuX3Rvb2wudXNlci5jb25maXJtKCJJcyB0aGlzIGRpZmYgY29ycmVjdD8iKToKICAgICAgICAg ICAgIGVycm9yKCJVc2VyIGRlY2xpbmVkIHRvIGNvbnRpbnVlLiIpCiAKIAotY2xhc3MgUG9zdERp ZmZUb0J1Z1N0ZXAoQWJzdHJhY3REaWZmU3RlcCk6CitjbGFzcyBQb3N0RGlmZlRvQnVnU3RlcChB YnN0cmFjdFN0ZXApOgogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBvcHRpb25zKGNscyk6CiAg ICAgICAgIHJldHVybiBbCkBAIC0yNDUsNyArMjU5LDcgQEAgY2xhc3MgUG9zdERpZmZUb0J1Z1N0 ZXAoQWJzdHJhY3REaWZmU3RlcCk6CiAgICAgICAgIF0KIAogICAgIGRlZiBydW4oc2VsZiwgc3Rh dGUpOgotICAgICAgICBkaWZmID0gc2VsZi5kaWZmKHN0YXRlKQorICAgICAgICBkaWZmID0gc2Vs Zi5jYWNoZWRfbG9va3VwKHN0YXRlLCAiZGlmZiIpCiAgICAgICAgIGRpZmZfZmlsZSA9IFN0cmlu Z0lPLlN0cmluZ0lPKGRpZmYpICMgYWRkX3BhdGNoX3RvX2J1ZyBleHBlY3RzIGEgZmlsZS1saWtl IG9iamVjdAogICAgICAgICBkZXNjcmlwdGlvbiA9IHNlbGYuX29wdGlvbnMuZGVzY3JpcHRpb24g b3IgIlBhdGNoIgogICAgICAgICBzZWxmLl90b29sLmJ1Z3MuYWRkX3BhdGNoX3RvX2J1ZyhzdGF0 ZVsiYnVnX2lkIl0sIGRpZmZfZmlsZSwgZGVzY3JpcHRpb24sIG1hcmtfZm9yX3Jldmlldz1zZWxm Ll9vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVlPXNlbGYuX29wdGlvbnMucmVx dWVzdF9jb21taXQpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29t bWFuZHMvdXBsb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3Vw bG9hZC5weQppbmRleCBhYzc5OTVmLi45MzFjZjZmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKQEAgLTk5LDcgKzk5LDE3IEBAIGNsYXNzIE9i c29sZXRlQXR0YWNobWVudHMoQWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZCk6CiAgICAgICAgIHJl dHVybiB7ICJidWdfaWQiIDogYXJnc1swXSB9CiAKIAotY2xhc3MgUG9zdERpZmYoQWJzdHJhY3RT ZXF1ZW5jZWRDb21tbWFuZCk6CitjbGFzcyBBYnN0cmFjdFBhdGNoVXBsb2FkaW5nQ29tbWFuZChB YnN0cmFjdFNlcXVlbmNlZENvbW1tYW5kKToKKyAgICBkZWYgX2J1Z19pZChzZWxmLCBhcmdzLCB0 b29sLCBzdGF0ZSk6CisgICAgICAgICMgUGVyZmVyIGEgYnVnIGlkIHBhc3NlZCBhcyBhbiBhcmd1 bWVudCBvdmVyIGEgYnVnIHVybCBpbiB0aGUgZGlmZiAoaS5lLiBDaGFuZ2VMb2dzKS4KKyAgICAg ICAgYnVnX2lkID0gYXJncyBhbmQgYXJnc1swXQorICAgICAgICBpZiBub3QgYnVnX2lkOgorICAg ICAgICAgICAgc3RhdGVbImRpZmYiXSA9IHRvb2wuc2NtKCkuY3JlYXRlX3BhdGNoKCkKKyAgICAg ICAgICAgIGJ1Z19pZCA9IHBhcnNlX2J1Z19pZChzdGF0ZVsiZGlmZiJdKQorICAgICAgICByZXR1 cm4gYnVnX2lkCisKKworY2xhc3MgUG9zdERpZmYoQWJzdHJhY3RQYXRjaFVwbG9hZGluZ0NvbW1h bmQpOgogICAgIG5hbWUgPSAicG9zdC1kaWZmIgogICAgIGhlbHBfdGV4dCA9ICJBdHRhY2ggdGhl IGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkgZGlmZiB0byBhIGJ1ZyBhcyBhIHBhdGNoIGZpbGUi CiAgICAgYXJndW1lbnRfbmFtZXMgPSAiW0JVR0lEXSIKQEAgLTExMSwxNSArMTIxLDEwIEBAIGNs YXNzIFBvc3REaWZmKEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQpOgogICAgIF0KIAogICAgIGRl ZiBfcHJlcGFyZV9zdGF0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKLSAgICAgICAgIyBQ ZXJmZXIgYSBidWcgaWQgcGFzc2VkIGFzIGFuIGFyZ3VtZW50IG92ZXIgYSBidWcgdXJsIGluIHRo ZSBkaWZmIChpLmUuIENoYW5nZUxvZ3MpLgogICAgICAgICBzdGF0ZSA9IHt9Ci0gICAgICAgIGJ1 Z19pZCA9IGFyZ3MgYW5kIGFyZ3NbMF0KLSAgICAgICAgaWYgbm90IGJ1Z19pZDoKLSAgICAgICAg ICAgIHN0YXRlWyJkaWZmIl0gPSB0b29sLnNjbSgpLmNyZWF0ZV9wYXRjaCgpCi0gICAgICAgICAg ICBidWdfaWQgPSBwYXJzZV9idWdfaWQoc3RhdGVbImRpZmYiXSkKLSAgICAgICAgaWYgbm90IGJ1 Z19pZDoKKyAgICAgICAgc3RhdGVbImJ1Z19pZCJdID0gc2VsZi5fYnVnX2lkKGFyZ3MsIHRvb2ws IHN0YXRlKQorICAgICAgICBpZiBub3Qgc3RhdGVbImJ1Z19pZCJdOgogICAgICAgICAgICAgZXJy b3IoIk5vIGJ1ZyBpZCBwYXNzZWQgYW5kIG5vIGJ1ZyB1cmwgZm91bmQgaW4gZGlmZiwgY2FuJ3Qg cG9zdC4iKQotICAgICAgICBzdGF0ZVsiYnVnX2lkIl0gPSBidWdfaWQKICAgICAgICAgcmV0dXJu IHN0YXRlCiAKIApAQCAtMTM4LDkgKzE0Myw5IEBAIGNsYXNzIFByZXBhcmVEaWZmKEFic3RyYWN0 U2VxdWVuY2VkQ29tbW1hbmQpOgogICAgICAgICByZXR1cm4geyAiYnVnX2lkIiA6IGJ1Z19pZCB9 CiAKIAotY2xhc3MgQ3JlYXRlUmV2aWV3KEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQpOgotICAg IG5hbWUgPSAiY3JlYXRlLXJldmlldyIKLSAgICBoZWxwX3RleHQgPSAiQWRkcyBhIENoYW5nZUxv ZyB0byB0aGUgY3VycmVudCBkaWZmIGFuZCBwb3N0cyBpdCB0byBhIChwb3NzaWJseSBuZXcpIGJ1 ZyIKK2NsYXNzIFN1Ym1pdFBhdGNoKEFic3RyYWN0UGF0Y2hVcGxvYWRpbmdDb21tYW5kKToKKyAg ICBuYW1lID0gInN1Ym1pdC1wYXRjaCIKKyAgICBoZWxwX3RleHQgPSAiQXV0b21hdGVzIHRoZSBw cm9jZXNzIG9mIHVwbG9hZGluZyBhIHBhdGNoIGZvciByZXZpZXciCiAgICAgYXJndW1lbnRfbmFt ZXMgPSAiW0JVR0lEXSIKICAgICBzdGVwcyA9IFsKICAgICAgICAgUHJvbXB0Rm9yQnVnT3JUaXRs ZVN0ZXAsCkBAIC0xNTMsOCArMTU4LDkgQEAgY2xhc3MgQ3JlYXRlUmV2aWV3KEFic3RyYWN0U2Vx dWVuY2VkQ29tbW1hbmQpOgogICAgIF0KIAogICAgIGRlZiBfcHJlcGFyZV9zdGF0ZShzZWxmLCBv cHRpb25zLCBhcmdzLCB0b29sKToKLSAgICAgICAgYnVnX2lkID0gYXJncyBhbmQgYXJnc1swXQot ICAgICAgICByZXR1cm4geyAiYnVnX2lkIiA6IGJ1Z19pZCB9CisgICAgICAgIHN0YXRlID0ge30K KyAgICAgICAgc3RhdGVbImJ1Z19pZCJdID0gc2VsZi5fYnVnX2lkKGFyZ3MsIHRvb2wsIHN0YXRl KQorICAgICAgICByZXR1cm4gc3RhdGUKIAogCiBjbGFzcyBFZGl0Q2hhbmdlTG9nKEFic3RyYWN0 U2VxdWVuY2VkQ29tbW1hbmQpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9k dWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKaW5kZXggYmYxMDc0MC4uM2MzNzBhZCAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZF91 bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBs b2FkX3VuaXR0ZXN0LnB5CkBAIC01Myw5ICs1Myw5IEBAIGNsYXNzIFVwbG9hZENvbW1hbmRzVGVz dChDb21tYW5kc1Rlc3QpOgogICAgIGRlZiB0ZXN0X3ByZXBhcmVfZGlmZihzZWxmKToKICAgICAg ICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFByZXBhcmVEaWZmKCksIFtdKQogCi0gICAg ZGVmIHRlc3RfY3JlYXRlX3JldmlldyhzZWxmKToKKyAgICBkZWYgdGVzdF9zdWJtaXRfcGF0Y2go c2VsZik6CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJPYnNvbGV0aW5nIDIgb2xkIHBhdGNo ZXMgb24gYnVnIDQyXG4iCi0gICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhDcmVh dGVSZXZpZXcoKSwgWzQyXSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKKyAgICAg ICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFN1Ym1pdFBhdGNoKCksIFs0Ml0sIGV4cGVj dGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9lZGl0X2NoYW5nZWxv ZyhzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKEVkaXRDaGFuZ2VM b2coKSwgW10pCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbW9ja19i dWd6aWxsYXRvb2wucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbW9ja19idWd6aWxs YXRvb2wucHkKaW5kZXggNzVkZjM3MC4uNjU3MmE2NSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9tb2NrX2J1Z3ppbGxhdG9vbC5weQpAQCAtMTgzLDcgKzE4Myw3IEBAIGNs YXNzIE1vY2tVc2VyKG9iamVjdCk6CiAgICAgZGVmIHBhZ2Uoc2VsZiwgbWVzc2FnZSk6CiAgICAg ICAgIHBhc3MKIAotICAgIGRlZiBjb25maXJtKHNlbGYpOgorICAgIGRlZiBjb25maXJtKHNlbGYs IG1lc3NhZ2U9Tm9uZSk6CiAgICAgICAgIHJldHVybiBUcnVlCiAKIApkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3VzZXIucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvdXNlci5weQppbmRleCA2YmU4OTA1Li5jNDZjY2ZiIDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvdXNlci5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvdXNlci5weQpAQCAtNDUsNiArNDUsOCBAQCBjbGFzcyBVc2VyKG9iamVjdCk6CiAgICAg ICAgIGV4Y2VwdCBJT0Vycm9yLCBlOgogICAgICAgICAgICAgcGFzcwogCi0gICAgZGVmIGNvbmZp cm0oc2VsZik6Ci0gICAgICAgIHJlc3BvbnNlID0gcmF3X2lucHV0KCJcbkNvbnRpbnVlPyBbWS9u XTogIikKKyAgICBkZWYgY29uZmlybShzZWxmLCBtZXNzYWdlPU5vbmUpOgorICAgICAgICBpZiBu b3QgbWVzc2FnZToKKyAgICAgICAgICAgIG1lc3NhZ2UgPSAiQ29udGludWU/IgorICAgICAgICBy ZXNwb25zZSA9IHJhd19pbnB1dCgiJXMgW1kvbl06ICIgJSBtZXNzYWdlKQogICAgICAgICByZXR1 cm4gbm90IHJlc3BvbnNlIG9yIHJlc3BvbnNlLmxvd2VyKCkgPT0gInkiCg== 45699 2009-12-30 23:24:44 -0800 2010-01-03 22:52:20 -0800 Patch bug-33070-20091230232443.patch text/plain 10657 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0ZDJmY2I4Li44MGNiMzdlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMDktMTIt MzAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbYnp0XSBNYWtlIGl0IGVhc2llciB0byBydW4g c3VibWl0LXBhdGNoIHdoZW4gcHJldmlvdXMgcnVuIGNhbmNlbGxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMwNzAKKworICAgICAgICBUaGlzIHBh dGNoIHJlbmFtZXMgY3JlYXRlLXJldmlldyB0byBzdWJtaXQtcGF0Y2ggKGFzIHJlcXVlc3RlZCBi eQorICAgICAgICBNYWNpZWopLgorCisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgaXQgZWFzaWVy IHRvIHJ1biBzdWJtaXQtcGF0Y2ggYWZ0ZXIgdGhlIHVzZXIgaGFzCisgICAgICAgIGFscmVhZHkg Y2FuY2VsbGVkIGEgcHJldmlvdXMgcnVuIG9mIHN1Ym1pdC1wYXRjaCBieSBkZXRlY3Rpbmcgd2hl biB3ZQorICAgICAgICBhbHJlYWR5IGhhdmUgQ2hhbmdlTG9ncyBhbmQgcmVhZGluZyB0aGUgYnVn IG51bWJlciBmcm9tIHRoZW0gKGFuZCBub3QKKyAgICAgICAgYXR0ZW1wdGluZyB0byByZWNyZWF0 ZSB0aGVtKS4gIEFzaWRlIGZyb20gcGVyZm9ybWFuY2UgYW5kIHRoZSBleHRyYQorICAgICAgICBl ZGl0IHN0ZXAsIHRoaXMgY29tbWFuZCBzaG91bGQgbm90IHN1YnN1bWUgcG9zdC1kaWYuCisKKyAg ICAgICAgQWxzbywgYWRkZWQgYSAtLWVtYWlsIGNvbW1hbmQgbGluZSBhcmd1bWVudCBzbyB0aGF0 IHRoZSBvdXRwdXQgb2YKKyAgICAgICAgcHJlcGFyZS1DaGFuZ2VMb2cgbWFrZXMgc2Vuc2Ugd2hl biBpdCBjYW4ndCBmaW5kIHRoZSB1c2VyJ3MgZW1haWwKKyAgICAgICAgYWRkcmVzcy4KKworICAg ICAgICAqIFNjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weToKKyAgICAgICAgKiBTY3JpcHRzL21v ZHVsZXMvYnVpbGRzdGVwcy5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMv dXBsb2FkLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5p dHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5 OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy91c2VyLnB5OgorCiAyMDA5LTEyLTMwICBLZXZp biBXYXR0ZXJzICA8a2V2aW53YXR0ZXJzQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBLZXZpbiBPbGxpdmllci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQpp bmRleCBiNDQzNTMzLi43MWM0MWQ5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvYnVnemlsbGEucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3pp bGxhLnB5CkBAIC0zNTEsOCArMzUxLDkgQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0KToKIAogICAg IGRlZiBhZGRfcGF0Y2hfdG9fYnVnKHNlbGYsIGJ1Z19pZCwgcGF0Y2hfZmlsZV9vYmplY3QsIGRl c2NyaXB0aW9uLCBjb21tZW50X3RleHQ9Tm9uZSwgbWFya19mb3JfcmV2aWV3PUZhbHNlLCBtYXJr X2Zvcl9jb21taXRfcXVldWU9RmFsc2UpOgogICAgICAgICBzZWxmLmF1dGhlbnRpY2F0ZSgpCi0g ICAgICAgIAotICAgICAgICBsb2coJ0FkZGluZyBwYXRjaCAiJXMiIHRvIGJ1ZyAlcycgJSAoZGVz Y3JpcHRpb24sIGJ1Z19pZCkpCisKKyAgICAgICAgbG9nKCdBZGRpbmcgcGF0Y2ggIiVzIiB0byAl c3Nob3dfYnVnLmNnaT9pZD0lcycgJSAoZGVzY3JpcHRpb24sIHNlbGYuYnVnX3NlcnZlcl91cmws IGJ1Z19pZCkpCisKICAgICAgICAgaWYgc2VsZi5kcnlydW46CiAgICAgICAgICAgICBsb2coY29t bWVudF90ZXh0KQogICAgICAgICAgICAgcmV0dXJuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvYnVpbGRzdGVwcy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9idWlsZHN0ZXBzLnB5CmluZGV4IGYzNzU0MTUuLjNkMGM5Y2UgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5CkBAIC04Niw2ICs4Niw3IEBAIGNsYXNzIENvbW1h bmRPcHRpb25zKG9iamVjdCk6CiAgICAgY2MgPSBtYWtlX29wdGlvbigiLS1jYyIsIGFjdGlvbj0i c3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJjYyIsIGhlbHA9IkNvbW1hLXNlcGFyYXRlZCBs aXN0IG9mIGVtYWlsIGFkZHJlc3NlcyB0byBjYXJib24tY29weS4iKQogICAgIGNvbXBvbmVudCA9 IG1ha2Vfb3B0aW9uKCItLWNvbXBvbmVudCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmci LCBkZXN0PSJjb21wb25lbnQiLCBoZWxwPSJDb21wb25lbnQgZm9yIHRoZSBuZXcgYnVnLiIpCiAg ICAgY29uZmlybSA9IG1ha2Vfb3B0aW9uKCItLW5vLWNvbmZpcm0iLCBhY3Rpb249InN0b3JlX2Zh bHNlIiwgZGVzdD0iY29uZmlybSIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iU2tpcCBjb25maXJtYXRp b24gc3RlcHMuIikKKyAgICBlbWFpbCA9IG1ha2Vfb3B0aW9uKCItLWVtYWlsIiwgYWN0aW9uPSJz dG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9ImVtYWlsIiwgaGVscD0iRW1haWwgYWRkcmVzcyB0 byB1c2UgaW4gQ2hhbmdlTG9ncy4iKQogCiAKIGNsYXNzIEFic3RyYWN0U3RlcChvYmplY3QpOgpA QCAtMTA2LDYgKzEwNywxOSBAQCBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKICAgICAgICAg c2VsZi5fcG9ydCA9IFdlYktpdFBvcnQucG9ydChzZWxmLl9vcHRpb25zLnBvcnQpCiAgICAgICAg IHJldHVybiBzZWxmLl9wb3J0CiAKKyAgICBfd2VsbF9rbm93bl9rZXlzID0geworICAgICAgICAi ZGlmZiIgOiBsYW1iZGEgc2VsZjogc2VsZi5fdG9vbC5zY20oKS5jcmVhdGVfcGF0Y2goKSwKKyAg ICAgICAgImNoYW5nZWxvZ3MiIDogbGFtYmRhIHNlbGY6IHNlbGYuX3Rvb2wuc2NtKCkubW9kaWZp ZWRfY2hhbmdlbG9ncygpLAorICAgIH0KKworICAgIGRlZiBjYWNoZWRfbG9va3VwKHNlbGYsIHN0 YXRlLCBrZXksIHByb21pc2U9Tm9uZSk6CisgICAgICAgIGlmIHN0YXRlLmdldChrZXkpOgorICAg ICAgICAgICAgcmV0dXJuIHN0YXRlW2tleV0KKyAgICAgICAgaWYgbm90IHByb21pc2U6CisgICAg ICAgICAgICBwcm9taXNlID0gc2VsZi5fd2VsbF9rbm93bl9rZXlzLmdldChrZXkpCisgICAgICAg IHN0YXRlW2tleV0gPSBwcm9taXNlKHNlbGYpCisgICAgICAgIHJldHVybiBzdGF0ZVtrZXldCisK ICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgb3B0aW9ucyhjbHMpOgogICAgICAgICByZXR1cm4g W10KQEAgLTE3NiwxOSArMTkwLDI4IEBAIGNsYXNzIFByZXBhcmVDaGFuZ2VMb2dTdGVwKEFic3Ry YWN0U3RlcCk6CiAgICAgICAgIHJldHVybiBbCiAgICAgICAgICAgICBDb21tYW5kT3B0aW9ucy5w b3J0LAogICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMucXVpZXQsCisgICAgICAgICAgICBDb21t YW5kT3B0aW9ucy5lbWFpbCwKICAgICAgICAgXQogCiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6 CisgICAgICAgIGlmIHNlbGYuY2FjaGVkX2xvb2t1cChzdGF0ZSwgImNoYW5nZWxvZ3MiKToKKyAg ICAgICAgICAgIHJldHVybgogICAgICAgICBvcy5jaGRpcihzZWxmLl90b29sLnNjbSgpLmNoZWNr b3V0X3Jvb3QpCiAgICAgICAgIGFyZ3MgPSBbc2VsZi5wb3J0KCkuc2NyaXB0X3BhdGgoInByZXBh cmUtQ2hhbmdlTG9nIildCiAgICAgICAgIGlmIHN0YXRlWyJidWdfaWQiXToKICAgICAgICAgICAg IGFyZ3MuYXBwZW5kKCItLWJ1Zz0lcyIgJSBzdGF0ZVsiYnVnX2lkIl0pCi0gICAgICAgIHNlbGYu X3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChhcmdzLCBzZWxmLl9vcHRpb25z LnF1aWV0KQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmVtYWlsOgorICAgICAgICAgICAgYXJn cy5hcHBlbmQoIi0tZW1haWw9JXMiICUgc2VsZi5fb3B0aW9ucy5lbWFpbCkKKyAgICAgICAgdHJ5 OgorICAgICAgICAgICAgc2VsZi5fdG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJvd19pZl9mYWls KGFyZ3MsIHNlbGYuX29wdGlvbnMucXVpZXQpCisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwg ZToKKyAgICAgICAgICAgIGVycm9yKCJVbmFibGUgdG8gcHJlcGFyZSBDaGFuZ2VMb2dzLiIpCisg ICAgICAgIHN0YXRlWyJkaWZmIl0gPSBOb25lICMgV2UndmUgY2hhbmdlZCB0aGUgZGlmZgogCiAK IGNsYXNzIEVkaXRDaGFuZ2VMb2dTdGVwKEFic3RyYWN0U3RlcCk6CiAgICAgZGVmIHJ1bihzZWxm LCBzdGF0ZSk6Ci0gICAgICAgIHNlbGYuX3Rvb2wudXNlci5lZGl0KHNlbGYuX3Rvb2wuc2NtKCku bW9kaWZpZWRfY2hhbmdlbG9ncygpKQorICAgICAgICBzZWxmLl90b29sLnVzZXIuZWRpdChzZWxm LmNhY2hlZF9sb29rdXAoc3RhdGUsICJjaGFuZ2Vsb2dzIikpCiAKIAogY2xhc3MgT2Jzb2xldGVQ YXRjaGVzT25CdWdTdGVwKEFic3RyYWN0U3RlcCk6CkBAIC0yMTAsMTYgKzIzMyw3IEBAIGNsYXNz IE9ic29sZXRlUGF0Y2hlc09uQnVnU3RlcChBYnN0cmFjdFN0ZXApOgogICAgICAgICAgICAgc2Vs Zi5fdG9vbC5idWdzLm9ic29sZXRlX2F0dGFjaG1lbnQocGF0Y2hbImlkIl0pCiAKIAotY2xhc3Mg QWJzdHJhY3REaWZmU3RlcChBYnN0cmFjdFN0ZXApOgotICAgIGRlZiBkaWZmKHNlbGYsIHN0YXRl KToKLSAgICAgICAgZGlmZiA9IHN0YXRlLmdldCgiZGlmZiIpCi0gICAgICAgIGlmIG5vdCBkaWZm OgotICAgICAgICAgICAgZGlmZiA9IHNlbGYuX3Rvb2wuc2NtKCkuY3JlYXRlX3BhdGNoKCkKLSAg ICAgICAgICAgIHN0YXRlWyJkaWZmIl0gPSBkaWZmCi0gICAgICAgIHJldHVybiBkaWZmCi0KLQot Y2xhc3MgQ29uZmlybURpZmZTdGVwKEFic3RyYWN0RGlmZlN0ZXApOgorY2xhc3MgQ29uZmlybURp ZmZTdGVwKEFic3RyYWN0U3RlcCk6CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIG9wdGlvbnMo Y2xzKToKICAgICAgICAgcmV0dXJuIFsKQEAgLTIyOSwxMyArMjQzLDEzIEBAIGNsYXNzIENvbmZp cm1EaWZmU3RlcChBYnN0cmFjdERpZmZTdGVwKToKICAgICBkZWYgcnVuKHNlbGYsIHN0YXRlKToK ICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuY29uZmlybToKICAgICAgICAgICAgIHJldHVy bgotICAgICAgICBkaWZmID0gc2VsZi5kaWZmKHN0YXRlKQorICAgICAgICBkaWZmID0gc2VsZi5j YWNoZWRfbG9va3VwKHN0YXRlLCAiZGlmZiIpCiAgICAgICAgIHNlbGYuX3Rvb2wudXNlci5wYWdl KGRpZmYpCi0gICAgICAgIGlmIG5vdCBzZWxmLl90b29sLnVzZXIuY29uZmlybSgpOgorICAgICAg ICBpZiBub3Qgc2VsZi5fdG9vbC51c2VyLmNvbmZpcm0oIldhcyB0aGF0IGRpZmYgY29ycmVjdD8i KToKICAgICAgICAgICAgIGVycm9yKCJVc2VyIGRlY2xpbmVkIHRvIGNvbnRpbnVlLiIpCiAKIAot Y2xhc3MgUG9zdERpZmZUb0J1Z1N0ZXAoQWJzdHJhY3REaWZmU3RlcCk6CitjbGFzcyBQb3N0RGlm ZlRvQnVnU3RlcChBYnN0cmFjdFN0ZXApOgogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBvcHRp b25zKGNscyk6CiAgICAgICAgIHJldHVybiBbCkBAIC0yNDUsNyArMjU5LDcgQEAgY2xhc3MgUG9z dERpZmZUb0J1Z1N0ZXAoQWJzdHJhY3REaWZmU3RlcCk6CiAgICAgICAgIF0KIAogICAgIGRlZiBy dW4oc2VsZiwgc3RhdGUpOgotICAgICAgICBkaWZmID0gc2VsZi5kaWZmKHN0YXRlKQorICAgICAg ICBkaWZmID0gc2VsZi5jYWNoZWRfbG9va3VwKHN0YXRlLCAiZGlmZiIpCiAgICAgICAgIGRpZmZf ZmlsZSA9IFN0cmluZ0lPLlN0cmluZ0lPKGRpZmYpICMgYWRkX3BhdGNoX3RvX2J1ZyBleHBlY3Rz IGEgZmlsZS1saWtlIG9iamVjdAogICAgICAgICBkZXNjcmlwdGlvbiA9IHNlbGYuX29wdGlvbnMu ZGVzY3JpcHRpb24gb3IgIlBhdGNoIgogICAgICAgICBzZWxmLl90b29sLmJ1Z3MuYWRkX3BhdGNo X3RvX2J1ZyhzdGF0ZVsiYnVnX2lkIl0sIGRpZmZfZmlsZSwgZGVzY3JpcHRpb24sIG1hcmtfZm9y X3Jldmlldz1zZWxmLl9vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVlPXNlbGYu X29wdGlvbnMucmVxdWVzdF9jb21taXQpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L2NvbW1hbmRzL3VwbG9hZC5weQppbmRleCBhYzc5OTVmLi45MzFjZjZmIDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKQEAgLTk5LDcgKzk5LDE3 IEBAIGNsYXNzIE9ic29sZXRlQXR0YWNobWVudHMoQWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZCk6 CiAgICAgICAgIHJldHVybiB7ICJidWdfaWQiIDogYXJnc1swXSB9CiAKIAotY2xhc3MgUG9zdERp ZmYoQWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZCk6CitjbGFzcyBBYnN0cmFjdFBhdGNoVXBsb2Fk aW5nQ29tbWFuZChBYnN0cmFjdFNlcXVlbmNlZENvbW1tYW5kKToKKyAgICBkZWYgX2J1Z19pZChz ZWxmLCBhcmdzLCB0b29sLCBzdGF0ZSk6CisgICAgICAgICMgUGVyZmVyIGEgYnVnIGlkIHBhc3Nl ZCBhcyBhbiBhcmd1bWVudCBvdmVyIGEgYnVnIHVybCBpbiB0aGUgZGlmZiAoaS5lLiBDaGFuZ2VM b2dzKS4KKyAgICAgICAgYnVnX2lkID0gYXJncyBhbmQgYXJnc1swXQorICAgICAgICBpZiBub3Qg YnVnX2lkOgorICAgICAgICAgICAgc3RhdGVbImRpZmYiXSA9IHRvb2wuc2NtKCkuY3JlYXRlX3Bh dGNoKCkKKyAgICAgICAgICAgIGJ1Z19pZCA9IHBhcnNlX2J1Z19pZChzdGF0ZVsiZGlmZiJdKQor ICAgICAgICByZXR1cm4gYnVnX2lkCisKKworY2xhc3MgUG9zdERpZmYoQWJzdHJhY3RQYXRjaFVw bG9hZGluZ0NvbW1hbmQpOgogICAgIG5hbWUgPSAicG9zdC1kaWZmIgogICAgIGhlbHBfdGV4dCA9 ICJBdHRhY2ggdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkgZGlmZiB0byBhIGJ1ZyBhcyBh IHBhdGNoIGZpbGUiCiAgICAgYXJndW1lbnRfbmFtZXMgPSAiW0JVR0lEXSIKQEAgLTExMSwxNSAr MTIxLDEwIEBAIGNsYXNzIFBvc3REaWZmKEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQpOgogICAg IF0KIAogICAgIGRlZiBfcHJlcGFyZV9zdGF0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToK LSAgICAgICAgIyBQZXJmZXIgYSBidWcgaWQgcGFzc2VkIGFzIGFuIGFyZ3VtZW50IG92ZXIgYSBi dWcgdXJsIGluIHRoZSBkaWZmIChpLmUuIENoYW5nZUxvZ3MpLgogICAgICAgICBzdGF0ZSA9IHt9 Ci0gICAgICAgIGJ1Z19pZCA9IGFyZ3MgYW5kIGFyZ3NbMF0KLSAgICAgICAgaWYgbm90IGJ1Z19p ZDoKLSAgICAgICAgICAgIHN0YXRlWyJkaWZmIl0gPSB0b29sLnNjbSgpLmNyZWF0ZV9wYXRjaCgp Ci0gICAgICAgICAgICBidWdfaWQgPSBwYXJzZV9idWdfaWQoc3RhdGVbImRpZmYiXSkKLSAgICAg ICAgaWYgbm90IGJ1Z19pZDoKKyAgICAgICAgc3RhdGVbImJ1Z19pZCJdID0gc2VsZi5fYnVnX2lk KGFyZ3MsIHRvb2wsIHN0YXRlKQorICAgICAgICBpZiBub3Qgc3RhdGVbImJ1Z19pZCJdOgogICAg ICAgICAgICAgZXJyb3IoIk5vIGJ1ZyBpZCBwYXNzZWQgYW5kIG5vIGJ1ZyB1cmwgZm91bmQgaW4g ZGlmZiwgY2FuJ3QgcG9zdC4iKQotICAgICAgICBzdGF0ZVsiYnVnX2lkIl0gPSBidWdfaWQKICAg ICAgICAgcmV0dXJuIHN0YXRlCiAKIApAQCAtMTM4LDkgKzE0Myw5IEBAIGNsYXNzIFByZXBhcmVE aWZmKEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQpOgogICAgICAgICByZXR1cm4geyAiYnVnX2lk IiA6IGJ1Z19pZCB9CiAKIAotY2xhc3MgQ3JlYXRlUmV2aWV3KEFic3RyYWN0U2VxdWVuY2VkQ29t bW1hbmQpOgotICAgIG5hbWUgPSAiY3JlYXRlLXJldmlldyIKLSAgICBoZWxwX3RleHQgPSAiQWRk cyBhIENoYW5nZUxvZyB0byB0aGUgY3VycmVudCBkaWZmIGFuZCBwb3N0cyBpdCB0byBhIChwb3Nz aWJseSBuZXcpIGJ1ZyIKK2NsYXNzIFN1Ym1pdFBhdGNoKEFic3RyYWN0UGF0Y2hVcGxvYWRpbmdD b21tYW5kKToKKyAgICBuYW1lID0gInN1Ym1pdC1wYXRjaCIKKyAgICBoZWxwX3RleHQgPSAiQXV0 b21hdGVzIHRoZSBwcm9jZXNzIG9mIHVwbG9hZGluZyBhIHBhdGNoIGZvciByZXZpZXciCiAgICAg YXJndW1lbnRfbmFtZXMgPSAiW0JVR0lEXSIKICAgICBzdGVwcyA9IFsKICAgICAgICAgUHJvbXB0 Rm9yQnVnT3JUaXRsZVN0ZXAsCkBAIC0xNTMsOCArMTU4LDkgQEAgY2xhc3MgQ3JlYXRlUmV2aWV3 KEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQpOgogICAgIF0KIAogICAgIGRlZiBfcHJlcGFyZV9z dGF0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKLSAgICAgICAgYnVnX2lkID0gYXJncyBh bmQgYXJnc1swXQotICAgICAgICByZXR1cm4geyAiYnVnX2lkIiA6IGJ1Z19pZCB9CisgICAgICAg IHN0YXRlID0ge30KKyAgICAgICAgc3RhdGVbImJ1Z19pZCJdID0gc2VsZi5fYnVnX2lkKGFyZ3Ms IHRvb2wsIHN0YXRlKQorICAgICAgICByZXR1cm4gc3RhdGUKIAogCiBjbGFzcyBFZGl0Q2hhbmdl TG9nKEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKaW5kZXggYmYxMDc0 MC4uM2MzNzBhZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1h bmRzL3VwbG9hZF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv Y29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CkBAIC01Myw5ICs1Myw5IEBAIGNsYXNzIFVwbG9h ZENvbW1hbmRzVGVzdChDb21tYW5kc1Rlc3QpOgogICAgIGRlZiB0ZXN0X3ByZXBhcmVfZGlmZihz ZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFByZXBhcmVEaWZmKCks IFtdKQogCi0gICAgZGVmIHRlc3RfY3JlYXRlX3JldmlldyhzZWxmKToKKyAgICBkZWYgdGVzdF9z dWJtaXRfcGF0Y2goc2VsZik6CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJPYnNvbGV0aW5n IDIgb2xkIHBhdGNoZXMgb24gYnVnIDQyXG4iCi0gICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVf b3V0cHV0cyhDcmVhdGVSZXZpZXcoKSwgWzQyXSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0 ZGVycikKKyAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFN1Ym1pdFBhdGNoKCks IFs0Ml0sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9l ZGl0X2NoYW5nZWxvZyhzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRz KEVkaXRDaGFuZ2VMb2coKSwgW10pCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvbW9ja19idWd6aWxsYXRvb2wucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv bW9ja19idWd6aWxsYXRvb2wucHkKaW5kZXggNzVkZjM3MC4uNjU3MmE2NSAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tb2NrX2J1Z3ppbGxhdG9vbC5weQpAQCAtMTgzLDcg KzE4Myw3IEBAIGNsYXNzIE1vY2tVc2VyKG9iamVjdCk6CiAgICAgZGVmIHBhZ2Uoc2VsZiwgbWVz c2FnZSk6CiAgICAgICAgIHBhc3MKIAotICAgIGRlZiBjb25maXJtKHNlbGYpOgorICAgIGRlZiBj b25maXJtKHNlbGYsIG1lc3NhZ2U9Tm9uZSk6CiAgICAgICAgIHJldHVybiBUcnVlCiAKIApkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3VzZXIucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvdXNlci5weQppbmRleCA2YmU4OTA1Li5jNDZjY2ZiIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvdXNlci5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvdXNlci5weQpAQCAtNDUsNiArNDUsOCBAQCBjbGFzcyBVc2VyKG9i amVjdCk6CiAgICAgICAgIGV4Y2VwdCBJT0Vycm9yLCBlOgogICAgICAgICAgICAgcGFzcwogCi0g ICAgZGVmIGNvbmZpcm0oc2VsZik6Ci0gICAgICAgIHJlc3BvbnNlID0gcmF3X2lucHV0KCJcbkNv bnRpbnVlPyBbWS9uXTogIikKKyAgICBkZWYgY29uZmlybShzZWxmLCBtZXNzYWdlPU5vbmUpOgor ICAgICAgICBpZiBub3QgbWVzc2FnZToKKyAgICAgICAgICAgIG1lc3NhZ2UgPSAiQ29udGludWU/ IgorICAgICAgICByZXNwb25zZSA9IHJhd19pbnB1dCgiJXMgW1kvbl06ICIgJSBtZXNzYWdlKQog ICAgICAgICByZXR1cm4gbm90IHJlc3BvbnNlIG9yIHJlc3BvbnNlLmxvd2VyKCkgPT0gInkiCg==