31754 2009-11-20 16:19:01 -0800 Teach the StatusBot how to support more than just the commit-queue 2009-11-20 19:17:39 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth evan oldest_to_newest 165496 0 eric 2009-11-20 16:19:01 -0800 Teach the StatusBot how to support more than just the commit-queue Make it possible to store more than just commit-queue data in the status bot instance @ webkit-commit-queue.appspot.com, even if for now we only display the commit-queue data there. 165502 1 43625 eric 2009-11-20 16:46:43 -0800 Created attachment 43625 Patch 165512 2 43631 eric 2009-11-20 16:58:27 -0800 Created attachment 43631 Remove uneeded queue_names restrictions 165514 3 43632 eric 2009-11-20 17:00:03 -0800 Created attachment 43632 Fix update_status.html 165518 4 43632 abarth 2009-11-20 17:01:29 -0800 Comment on attachment 43632 Fix update_status.html I'm not an appengine expert, but that looks reasonable. 165519 5 eric 2009-11-20 17:02:38 -0800 CCing Evan, who has done a bunch of App Engine stuff, so more eyeballs see this go by. 165520 6 eric 2009-11-20 17:03:01 -0800 Committed r51264: <http://trac.webkit.org/changeset/51264> 165524 7 eric 2009-11-20 17:09:48 -0800 Committed r51265: <http://trac.webkit.org/changeset/51265> 165528 8 eric 2009-11-20 17:15:47 -0800 Committed r51266: <http://trac.webkit.org/changeset/51266> 165547 9 eric 2009-11-20 19:15:10 -0800 Committed r51275: <http://trac.webkit.org/changeset/51275> 165550 10 eric 2009-11-20 19:17:39 -0800 Sigh. Some of those were caused by bug 31761. 43625 2009-11-20 16:46:43 -0800 2009-11-20 16:58:18 -0800 Patch bug-31754-20091120164641.patch text/plain 12630 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNzE1MzJkLi5hMTc3YmZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMDktMTEt MjAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlYWNoIHRoZSBTdGF0dXNCb3QgaG93IHRvIHN1 cHBvcnQgbW9yZSB0aGFuIGp1c3QgdGhlIGNvbW1pdC1xdWV1ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3NTQKKworICAgICAgICAqIENvbW1pdFF1 ZXVlU3RhdHVzL2luZGV4LnlhbWw6CisgICAgICAgICAtIEFkZCBpbmRpY2VzIHJlcXVpcmVkIGZv ciB0aGUgbmV3IHF1ZXJpZXMuCisgICAgICAgICogQ29tbWl0UXVldWVTdGF0dXMvcXVldWVfc3Rh dHVzLnB5OgorICAgICAgICAgLSBBZGQgYSBwYXRjaC1zdGF0dXMgcGFnZSBhbmQgbW92ZSB1cGRh dGVfc3RhdHVzIHRvIHVwZGF0ZS1zdGF0dXMuCisgICAgICAgICAtIE9ubHkgZGlzcGxheSAiY29t bWl0LXF1ZXVlIiBzdGF0dXMgcmVjb3JkcyBmb3IgdGhlIGNvbW1pdC1xdWV1ZS4KKyAgICAgICAg IC0gQWRkIHN1cHBvcnQgZm9yIGEgcXVldWVfbmFtZSBwcm9wZXJ0eSBvbiBzdGF0dXMgcmVjb3Jk cy4KKyAgICAgICAgIC0gRml4IF9pbnRfZnJvbV9yZXF1ZXN0IHRvIGFjdHVhbGx5IHdvcmsuCisg ICAgICAgICogQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1cy5odG1sOgorICAgICAgICAg LSBBZGQgc3VwcG9ydCBmb3IgYSBxdWV1ZV9uYW1lIG9uIHN0YXR1cyByZWNvcmRzLgorICAgICAg ICAgLSBSZW1vdmUgdW51c2VkIGxpc3Qgb2YgYnVnIGlkcy4KKyAgICAgICAgICogU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weQorICAgICAgICAgIC0gTWFrZSB0aGUgcXVldWVzIHBh c3MgdGhlIHBhdGNoIGluc3RlYWQgb2YgdGhlIGJ1Z19pZCB0byBTdGF0dXNCb3QuCisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2JvdC5weToKKyAgICAgICAgIC0gU3VwcG9ydCBwYXNz aW5nIHRoZSBxdWV1ZV9uYW1lIHRvIHRoZSBzdGF0dXMgdXBkYXRlcy4KKyAgICAgICAgIC0gU3Vw cG9ydCBmZXRjaGluZyBwYXRjaCBzdGF0dXMgd2l0aCBwYXRjaF9zdGF0dXMoKS4KKyAgICAgICAg KiBTY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5OgorICAgICAgICAgLSBQYXNzIHRoZSBwYXRj aCB0byB0aGUgU3RhdHVzQm90IGluc3RlYWQgb2YgdGhlIGJ1Z19pZC4KKyAgICAgICAgIC0gTGV0 IFdvcmtRdWV1ZXMgaGF2ZSBhIG5hbWUuCisKIDIwMDktMTEtMjAgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVlU3RhdHVzL2luZGV4LnlhbWwgYi9XZWJLaXRU b29scy9Db21taXRRdWV1ZVN0YXR1cy9pbmRleC55YW1sCmluZGV4IGEzYjllMDUuLmJmMTEyNjIg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVlU3RhdHVzL2luZGV4LnlhbWwKKysr IGIvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvaW5kZXgueWFtbApAQCAtOSwzICs5LDE2 IEBAIGluZGV4ZXM6CiAjIG1hbnVhbGx5LCBtb3ZlIHRoZW0gYWJvdmUgdGhlIG1hcmtlciBsaW5l LiAgVGhlIGluZGV4LnlhbWwgZmlsZSBpcwogIyBhdXRvbWF0aWNhbGx5IHVwbG9hZGVkIHRvIHRo ZSBhZG1pbiBjb25zb2xlIHdoZW4geW91IG5leHQgZGVwbG95CiAjIHlvdXIgYXBwbGljYXRpb24g dXNpbmcgYXBwY2ZnLnB5LgorCistIGtpbmQ6IFF1ZXVlU3RhdHVzCisgIHByb3BlcnRpZXM6Cisg IC0gbmFtZTogYWN0aXZlX3BhdGNoX2lkCisgIC0gbmFtZTogcXVldWVfbmFtZQorICAtIG5hbWU6 IGRhdGUKKyAgICBkaXJlY3Rpb246IGRlc2MKKworLSBraW5kOiBRdWV1ZVN0YXR1cworICBwcm9w ZXJ0aWVzOgorICAtIG5hbWU6IHF1ZXVlX25hbWUKKyAgLSBuYW1lOiBkYXRlCisgICAgZGlyZWN0 aW9uOiBkZXNjCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9Db21taXRRdWV1ZVN0YXR1cy9xdWV1 ZV9zdGF0dXMucHkgYi9XZWJLaXRUb29scy9Db21taXRRdWV1ZVN0YXR1cy9xdWV1ZV9zdGF0dXMu cHkKaW5kZXggMzBkMjQ5NC4uMGMzYjM2MSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ29tbWl0 UXVldWVTdGF0dXMvcXVldWVfc3RhdHVzLnB5CisrKyBiL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVl U3RhdHVzL3F1ZXVlX3N0YXR1cy5weQpAQCAtNDEsMzEgKzQxLDU3IEBAIGZyb20gZ29vZ2xlLmFw cGVuZ2luZS5leHQgaW1wb3J0IGRiCiAKIHdlYmFwcC50ZW1wbGF0ZS5yZWdpc3Rlcl90ZW1wbGF0 ZV9saWJyYXJ5KCdmaWx0ZXJzLndlYmtpdF9leHRyYXMnKQogCitxdWV1ZV9uYW1lcyA9IHNldChb CisgICAgImNvbW1pdC1xdWV1ZSIsCisgICAgInN0eWxlLXF1ZXVlIiwKK10pCisKIGNsYXNzIFF1 ZXVlU3RhdHVzKGRiLk1vZGVsKToKICAgICBhdXRob3IgPSBkYi5Vc2VyUHJvcGVydHkoKQorICAg IHF1ZXVlX25hbWUgPSBkYi5TdHJpbmdQcm9wZXJ0eSgpCiAgICAgYWN0aXZlX2J1Z19pZCA9IGRi LkludGVnZXJQcm9wZXJ0eSgpCiAgICAgYWN0aXZlX3BhdGNoX2lkID0gZGIuSW50ZWdlclByb3Bl cnR5KCkKICAgICBtZXNzYWdlID0gZGIuU3RyaW5nUHJvcGVydHkobXVsdGlsaW5lPVRydWUpCiAg ICAgZGF0ZSA9IGRiLkRhdGVUaW1lUHJvcGVydHkoYXV0b19ub3dfYWRkPVRydWUpCiAKKwogY2xh c3MgTWFpblBhZ2Uod2ViYXBwLlJlcXVlc3RIYW5kbGVyKToKICAgICBkZWYgZ2V0KHNlbGYpOgot ICAgICAgICBzdGF0dXNlc19xdWVyeSA9IFF1ZXVlU3RhdHVzLmFsbCgpLm9yZGVyKCctZGF0ZScp CisgICAgICAgIHN0YXR1c2VzX3F1ZXJ5ID0gUXVldWVTdGF0dXMuYWxsKCkuZmlsdGVyKCdxdWV1 ZV9uYW1lID0nLCAnY29tbWl0LXF1ZXVlJykub3JkZXIoJy1kYXRlJykKICAgICAgICAgc3RhdHVz ZXMgPSBzdGF0dXNlc19xdWVyeS5mZXRjaCg2KQorICAgICAgICBpZiBub3Qgc3RhdHVzZXM6Cisg ICAgICAgICAgICByZXR1cm4gc2VsZi5yZXNwb25zZS5vdXQud3JpdGUoIk5vIHN0YXR1cyB0byBy ZXBvcnQuIikKICAgICAgICAgdGVtcGxhdGVfdmFsdWVzID0gewogICAgICAgICAgICAgJ2xhc3Rf c3RhdHVzJyA6IHN0YXR1c2VzWzBdLAogICAgICAgICAgICAgJ3JlY2VudF9zdGF0dXNlcycgOiBz dGF0dXNlc1sxOl0sCiAgICAgICAgIH0KICAgICAgICAgc2VsZi5yZXNwb25zZS5vdXQud3JpdGUo dGVtcGxhdGUucmVuZGVyKCdpbmRleC5odG1sJywgdGVtcGxhdGVfdmFsdWVzKSkKIAorCitjbGFz cyBQYXRjaFN0YXR1cyh3ZWJhcHAuUmVxdWVzdEhhbmRsZXIpOgorICAgIGRlZiBnZXQoc2VsZiwg cXVldWVfbmFtZSwgYXR0YWNobWVudF9pZF9zdHJpbmcpOgorICAgICAgICBpZiBxdWV1ZV9uYW1l IG5vdCBpbiBxdWV1ZV9uYW1lczoKKyAgICAgICAgICAgIHNlbGYuZXJyb3IoNDA0KQorICAgICAg ICBhdHRhY2htZW50X2lkID0gaW50KGF0dGFjaG1lbnRfaWRfc3RyaW5nKQorCisgICAgICAgIHN0 YXR1c2VzID0gUXVldWVTdGF0dXMuYWxsKCkuZmlsdGVyKCdxdWV1ZV9uYW1lID0nLCBxdWV1ZV9u YW1lKS5maWx0ZXIoJ2FjdGl2ZV9wYXRjaF9pZCA9JywgYXR0YWNobWVudF9pZCkub3JkZXIoJy1k YXRlJykKKyAgICAgICAgaWYgbm90IHN0YXR1c2VzOgorICAgICAgICAgICAgc2VsZi5lcnJvcig0 MDQpCisgICAgICAgIHNlbGYucmVzcG9uc2Uub3V0LndyaXRlKHN0YXR1c2VzWzBdLm1lc3NhZ2Up CisKKwogY2xhc3MgVXBkYXRlU3RhdHVzKHdlYmFwcC5SZXF1ZXN0SGFuZGxlcik6CiAgICAgZGVm IGdldChzZWxmKToKLSAgICAgICAgc2VsZi5yZXNwb25zZS5vdXQud3JpdGUodGVtcGxhdGUucmVu ZGVyKCd1cGRhdGVfc3RhdHVzLmh0bWwnLCBOb25lKSkKKyAgICAgICAgdGVtcGxhdGVfdmFsdWVz ID0geworICAgICAgICAgICAgJ3F1ZXVlX25hbWVzJyA6IHF1ZXVlX25hbWVzLAorICAgICAgICB9 CisgICAgICAgIHNlbGYucmVzcG9uc2Uub3V0LndyaXRlKHRlbXBsYXRlLnJlbmRlcigndXBkYXRl X3N0YXR1cy5odG1sJywgdGVtcGxhdGVfdmFsdWVzKSkKIAogICAgIGRlZiBfaW50X2Zyb21fcmVx dWVzdChzZWxmLCBuYW1lKToKICAgICAgICAgc3RyaW5nX3ZhbHVlID0gc2VsZi5yZXF1ZXN0Lmdl dChuYW1lKQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBpbnRfdmFsdWUgPSBpbnQoc3RyaW5n X3ZhbHVlKQorICAgICAgICAgICAgcmV0dXJuIGludF92YWx1ZQogICAgICAgICBleGNlcHQgVmFs dWVFcnJvciwgVHlwZUVycm9yOgogICAgICAgICAgICAgcGFzcwogICAgICAgICByZXR1cm4gTm9u ZQpAQCAtNzYsMTUgKzEwMiwyMiBAQCBjbGFzcyBVcGRhdGVTdGF0dXMod2ViYXBwLlJlcXVlc3RI YW5kbGVyKToKICAgICAgICAgaWYgdXNlcnMuZ2V0X2N1cnJlbnRfdXNlcigpOgogICAgICAgICAg ICAgcXVldWVfc3RhdHVzLmF1dGhvciA9IHVzZXJzLmdldF9jdXJyZW50X3VzZXIoKQogCisgICAg ICAgIHF1ZXVlX25hbWUgPSBzZWxmLnJlcXVlc3QuZ2V0KCdxdWV1ZV9uYW1lJykKKyAgICAgICAg aWYgcXVldWVfbmFtZSBub3QgaW4gcXVldWVfbmFtZXM6CisgICAgICAgICAgICBzZWxmLmVycm9y KDUwMCkKKworICAgICAgICBxdWV1ZV9zdGF0dXMucXVldWVfbmFtZSA9IHF1ZXVlX25hbWUKICAg ICAgICAgcXVldWVfc3RhdHVzLmFjdGl2ZV9idWdfaWQgPSBzZWxmLl9pbnRfZnJvbV9yZXF1ZXN0 KCdidWdfaWQnKQogICAgICAgICBxdWV1ZV9zdGF0dXMuYWN0aXZlX3BhdGNoX2lkID0gc2VsZi5f aW50X2Zyb21fcmVxdWVzdCgncGF0Y2hfaWQnKQogICAgICAgICBxdWV1ZV9zdGF0dXMubWVzc2Fn ZSA9IHNlbGYucmVxdWVzdC5nZXQoJ3N0YXR1cycpCiAgICAgICAgIHF1ZXVlX3N0YXR1cy5wdXQo KQogICAgICAgICBzZWxmLnJlZGlyZWN0KCcvJykKIAorCiByb3V0ZXMgPSBbCiAgICAgKCcvJywg TWFpblBhZ2UpLAotICAgICgnL3VwZGF0ZV9zdGF0dXMnLCBVcGRhdGVTdGF0dXMpCisgICAgKCcv dXBkYXRlLXN0YXR1cycsIFVwZGF0ZVN0YXR1cyksCisgICAgKHInL3BhdGNoLXN0YXR1cy8oLiop LyguKiknLCBQYXRjaFN0YXR1cyksCiBdCiAKIGFwcGxpY2F0aW9uID0gd2ViYXBwLldTR0lBcHBs aWNhdGlvbihyb3V0ZXMsIGRlYnVnPVRydWUpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9Db21t aXRRdWV1ZVN0YXR1cy91cGRhdGVfc3RhdHVzLmh0bWwgYi9XZWJLaXRUb29scy9Db21taXRRdWV1 ZVN0YXR1cy91cGRhdGVfc3RhdHVzLmh0bWwKaW5kZXggZWRhZmJhNC4uZWFjNmM1OCAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1cy5odG1sCisr KyBiL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVlU3RhdHVzL3VwZGF0ZV9zdGF0dXMuaHRtbApAQCAt MSw1ICsxLDEwIEBACi1VcGRhdGUgdGhlIGN1cnJlbnQgc3RhdHVzIG9mIHRoZSBjb21taXQtcXVl dWU6CiA8Zm9ybSBuYW1lPSJ1cGRhdGVfc3RhdHVzIiBtZXRob2Q9InBvc3QiPgorVXBkYXRlIHN0 YXR1cyBmb3IgYSBxdWV1ZToKKyA8c2VsZWN0IG5hbWU9InF1ZXVlX25hbWUiPgorICAgIHslIGZv ciBxdWV1ZV9uYW1lIGluIHF1ZXVlX25hbWVzICV9CisgICAgPG9wdGlvbj57eyBxdWV1ZV9uYW1l IH19PC9vcHRpb24+CisgICAgeyUgZW5kZm9yICV9CisgPC9zZWxlY3Q+CiAgPGRpdj4KICAgICAg QWN0aXZlIEJ1ZyBJZDoKICAgICA8aW5wdXQgbmFtZT0iYnVnX2lkIj4KQEAgLTgsMTEgKzEzLDgg QEAgVXBkYXRlIHRoZSBjdXJyZW50IHN0YXR1cyBvZiB0aGUgY29tbWl0LXF1ZXVlOgogICAgICBB Y3RpdmUgUGF0Y2ggSWQ6CiAgICAgPGlucHV0IG5hbWU9InBhdGNoX2lkIj4KICA8L2Rpdj4KLSA8 ZGl2PgotICAgICBTcGFjZSBzZXBhcmF0ZWQgbGlzdCBvZiBvdGhlciBidWdzIGluIHF1ZXVlOgot ICAgIDxpbnB1dCBuYW1lPSJidWdzX2luX3F1ZXVlIj4KLSA8L2Rpdj4KICAgPGRpdj4KKyAgICAg IFN0YXR1cyBUZXh0Ojxicj4KICAgICAgIDx0ZXh0YXJlYSBuYW1lPSJzdGF0dXMiIHJvd3M9IjMi IGNvbHM9IjYwIj48L3RleHRhcmVhPgogICA8L2Rpdj4KICAgPGRpdj48aW5wdXQgdHlwZT0ic3Vi bWl0IiB2YWx1ZT0iQWRkIFN0YXR1cyI+PC9kaXY+CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVldWVzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weQppbmRleCBjYmQ0ZjhmLi43ZWRkNzBkIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVldWVzLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXMucHkKQEAgLTEwNiw3 ICsxMDYsNyBAQCBjbGFzcyBBYnN0cmFjdFF1ZXVlKENvbW1hbmQsIFdvcmtRdWV1ZURlbGVnYXRl KToKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAg c2VsZi5vcHRpb25zID0gb3B0aW9ucwogICAgICAgICBzZWxmLnRvb2wgPSB0b29sCi0gICAgICAg IHdvcmtfcXVldWUgPSBXb3JrUXVldWUoc2VsZikKKyAgICAgICAgd29ya19xdWV1ZSA9IFdvcmtR dWV1ZShzZWxmLCBzZWxmLm5hbWUpCiAgICAgICAgIHdvcmtfcXVldWUucnVuKCkKIAogCkBAIC0x MzEsNyArMTMxLDcgQEAgY2xhc3MgQ29tbWl0UXVldWUoQWJzdHJhY3RRdWV1ZSk6CiAgICAgICAg IGlmIHJlZF9idWlsZGVyc19uYW1lczoKICAgICAgICAgICAgIHJlZF9idWlsZGVyc19uYW1lcyA9 IG1hcChsYW1iZGEgbmFtZTogIlwiJXNcIiIgJSBuYW1lLCByZWRfYnVpbGRlcnNfbmFtZXMpICMg QWRkIHF1b3RlcyBhcm91bmQgdGhlIG5hbWVzLgogICAgICAgICAgICAgcmV0dXJuIChGYWxzZSwg IkJ1aWxkZXJzIFslc10gYXJlIHJlZC4gU2VlIGh0dHA6Ly9idWlsZC53ZWJraXQub3JnLiIgJSAi LCAiLmpvaW4ocmVkX2J1aWxkZXJzX25hbWVzKSwgTm9uZSkKLSAgICAgICAgcmV0dXJuIChUcnVl LCAiTGFuZGluZyBwYXRjaCAlcyBmcm9tIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsi YnVnX2lkIl0pLCBwYXRjaFsiYnVnX2lkIl0pCisgICAgICAgIHJldHVybiAoVHJ1ZSwgIkxhbmRp bmcgcGF0Y2ggJXMgZnJvbSBidWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJd KSwgcGF0Y2gpCiAKICAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgogICAg ICAgICBzZWxmLnJ1bl9idWd6aWxsYV90b29sKFsibGFuZC1hdHRhY2htZW50IiwgIi0tZm9yY2Ut Y2xlYW4iLCAiLS1ub24taW50ZXJhY3RpdmUiLCAiLS1xdWlldCIsIHBhdGNoWyJpZCJdXSkKQEAg LTE3Miw3ICsxNzIsNyBAQCBjbGFzcyBTdHlsZVF1ZXVlKEFic3RyYWN0VHJ5UXVldWUpOgogICAg ICAgICBBYnN0cmFjdFRyeVF1ZXVlLl9faW5pdF9fKHNlbGYpCiAKICAgICBkZWYgc2hvdWxkX3By b2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgotICAgICAgICByZXR1cm4gKFRydWUs ICJDaGVja2luZyBzdHlsZSBmb3IgcGF0Y2ggJXMgb24gYnVnICVzLiIgJSAocGF0Y2hbImlkIl0s IHBhdGNoWyJidWdfaWQiXSksIHBhdGNoWyJidWdfaWQiXSkKKyAgICAgICAgcmV0dXJuIChUcnVl LCAiQ2hlY2tpbmcgc3R5bGUgZm9yIHBhdGNoICVzIG9uIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJd LCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaCkKIAogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShz ZWxmLCBwYXRjaCk6CiAgICAgICAgIHNlbGYucnVuX2J1Z3ppbGxhX3Rvb2woWyJjaGVjay1zdHls ZSIsICItLWZvcmNlLWNsZWFuIiwgcGF0Y2hbImlkIl1dKQpAQCAtMTkzLDcgKzE5Myw3IEBAIGNs YXNzIEJ1aWxkUXVldWUoQWJzdHJhY3RUcnlRdWV1ZSk6CiAgICAgICAgICAgICBzZWxmLnJ1bl9i dWd6aWxsYV90b29sKFsiYnVpbGQiLCBzZWxmLnBvcnQuZmxhZygpLCAiLS1mb3JjZS1jbGVhbiIs ICItLXF1aWV0Il0pCiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKICAgICAgICAgICAg IHJldHVybiAoRmFsc2UsICJVbmFibGUgdG8gcGVyZm9ybSBhIGJ1aWxkLiIsIE5vbmUpCi0gICAg ICAgIHJldHVybiAoVHJ1ZSwgIkJ1aWxkaW5nIHBhdGNoICVzIG9uIGJ1ZyAlcy4iICUgKHBhdGNo WyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaFsiYnVnX2lkIl0pCisgICAgICAgIHJldHVy biAoVHJ1ZSwgIkJ1aWxkaW5nIHBhdGNoICVzIG9uIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBw YXRjaFsiYnVnX2lkIl0pLCBwYXRjaCkKIAogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxm LCBwYXRjaCk6CiAgICAgICAgIHNlbGYucnVuX2J1Z3ppbGxhX3Rvb2woWyJidWlsZC1hdHRhY2ht ZW50Iiwgc2VsZi5wb3J0LmZsYWcoKSwgIi0tZm9yY2UtY2xlYW4iLCAiLS1xdWlldCIsICItLW5v LXVwZGF0ZSIsIHBhdGNoWyJpZCJdXSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9zdGF0dXNib3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc3RhdHVz Ym90LnB5CmluZGV4IGQ5YjU0YjMuLjE0OWI4MGYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9zdGF0dXNib3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL3N0YXR1c2JvdC5weQpAQCAtNDYsMjQgKzQ2LDM5IEBAIGh0dHA6Ly93d3dzZWFyY2guc291 cmNlZm9yZ2UubmV0L21lY2hhbml6ZS8KICIiIgogICAgIGV4aXQoMSkKIAoraW1wb3J0IHVybGxp YjIKKworCiBjbGFzcyBTdGF0dXNCb3Q6CiAgICAgZGVmYXVsdF9ob3N0ID0gIndlYmtpdC1jb21t aXQtcXVldWUuYXBwc3BvdC5jb20iCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdD1kZWZh dWx0X2hvc3QpOgogICAgICAgICBzZWxmLnN0YXR1c2JvdF9ob3N0ID0gaG9zdAogICAgICAgICBz ZWxmLnN0YXR1c2JvdF9zZXJ2ZXJfdXJsID0gImh0dHA6Ly8lcyIgJSBzZWxmLnN0YXR1c2JvdF9o b3N0Ci0gICAgICAgIHNlbGYudXBkYXRlX3N0YXR1c191cmwgPSAiJXMvdXBkYXRlX3N0YXR1cyIg JSBzZWxmLnN0YXR1c2JvdF9zZXJ2ZXJfdXJsCiAgICAgICAgIHNlbGYuYnJvd3NlciA9IEJyb3dz ZXIoKQogCi0gICAgZGVmIHVwZGF0ZV9zdGF0dXMoc2VsZiwgc3RhdHVzLCBidWdfaWQ9Tm9uZSwg cGF0Y2hfaWQ9Tm9uZSk6CisgICAgZGVmIHVwZGF0ZV9zdGF0dXMoc2VsZiwgcXVldWVfbmFtZSwg c3RhdHVzLCBwYXRjaCk6CiAgICAgICAgICMgRHVyaW5nIHVuaXQgdGVzdGluZywgc3RhdHVzYm90 X2hvc3QgaXMgTm9uZQogICAgICAgICBpZiBub3Qgc2VsZi5zdGF0dXNib3RfaG9zdDoKICAgICAg ICAgICAgIHJldHVybgotICAgICAgICBzZWxmLmJyb3dzZXIub3BlbihzZWxmLnVwZGF0ZV9zdGF0 dXNfdXJsKQorCisgICAgICAgIHVwZGF0ZV9zdGF0dXNfdXJsID0gIiVzL3VwZGF0ZS1zdGF0dXMi ICUgc2VsZi5zdGF0dXNib3Rfc2VydmVyX3VybAorICAgICAgICBzZWxmLmJyb3dzZXIub3Blbih1 cGRhdGVfc3RhdHVzX3VybCkKICAgICAgICAgc2VsZi5icm93c2VyLnNlbGVjdF9mb3JtKG5hbWU9 InVwZGF0ZV9zdGF0dXMiKQotICAgICAgICBpZiBidWdfaWQ6Ci0gICAgICAgICAgICBzZWxmLmJy b3dzZXJbJ2J1Z19pZCddID0gc3RyKGJ1Z19pZCkKLSAgICAgICAgaWYgcGF0Y2hfaWQ6Ci0gICAg ICAgICAgICBzZWxmLmJyb3dzZXJbJ3BhdGNoX2lkJ10gPSBzdHIocGF0Y2hfaWQpCisgICAgICAg IHNlbGYuYnJvd3NlclsncXVldWVfbmFtZSddLnZhbHVlID0gKHF1ZXVlX25hbWUsKQorICAgICAg ICBpZiBwYXRjaDoKKyAgICAgICAgICAgIGlmIHBhdGNoLmdldCgnYnVnX2lkJyk6CisgICAgICAg ICAgICAgICAgc2VsZi5icm93c2VyWydidWdfaWQnXSA9IHN0cihwYXRjaFsnYnVnX2lkJ10pCisg ICAgICAgICAgICBpZiBwYXRjaC5nZXQoJ2lkJyk6CisgICAgICAgICAgICAgICAgc2VsZi5icm93 c2VyWydwYXRjaF9pZCddID0gc3RyKHBhdGNoWydpZCddKQogICAgICAgICBzZWxmLmJyb3dzZXJb J3N0YXR1cyddID0gc3RhdHVzCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zdWJtaXQoKQorCisgICAg ZGVmIHBhdGNoX3N0YXR1cyhzZWxmLCBxdWV1ZV9uYW1lLCBwYXRjaF9pZCk6CisgICAgICAgIHVw ZGF0ZV9zdGF0dXNfdXJsID0gIiVzL3BhdGNoLXN0YXR1cy8lcy8lcyIgJSAoc2VsZi5zdGF0dXNi b3Rfc2VydmVyX3VybCwgcXVldWVfbmFtZSwgcGF0Y2hfaWQpCisgICAgICAgIHRyeToKKyAgICAg ICAgICAgIHJldHVybiB1cmxsaWIyLnVybG9wZW4odXBkYXRlX3N0YXR1c191cmwpLnJlYWQoKQor ICAgICAgICBleGNlcHQgdXJsbGliMi5IVFRQRXJyb3IsIGU6CisgICAgICAgICAgICBpZiBlLmNv ZGUgPT0gNDA0OgorICAgICAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgICAgICByYWlz ZSBlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5 IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5weQppbmRleCA4ZTcxNDgx Li45OTdjOGI3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1 ZXVlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWUucHkKQEAg LTM4LDYgKzM4LDkgQEAgZnJvbSBtb2R1bGVzLnNjbSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZyb20g bW9kdWxlcy5zdGF0dXNib3QgaW1wb3J0IFN0YXR1c0JvdAogCiBjbGFzcyBXb3JrUXVldWVEZWxl Z2F0ZToKKyAgICBkZWYgcXVldWVfbmFtZShzZWxmKToKKyAgICAgICAgcmFpc2UgTm90SW1wbGVt ZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCisKICAgICBkZWYgcXVldWVf bG9nX3BhdGgoc2VsZik6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IsICJzdWJj bGFzc2VzIG11c3QgaW1wbGVtZW50IgogCkBAIC01Nyw3ICs2MCw3IEBAIGNsYXNzIFdvcmtRdWV1 ZURlbGVnYXRlOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xhc3Nl cyBtdXN0IGltcGxlbWVudCIKIAogICAgIGRlZiBzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRl bShzZWxmLCB3b3JrX2l0ZW0pOgotICAgICAgICAjIHJldHVybnMgKHNhZmVfdG9fcHJvY2VlZCwg d2FpdGluZ19tZXNzYWdlLCBidWdfaWQpCisgICAgICAgICMgcmV0dXJucyAoc2FmZV90b19wcm9j ZWVkLCB3YWl0aW5nX21lc3NhZ2UsIHBhdGNoKQogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRl ZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIKIAogICAgIGRlZiBwcm9jZXNzX3dv cmtfaXRlbShzZWxmLCB3b3JrX2l0ZW0pOgpAQCAtNjgsNyArNzEsOCBAQCBjbGFzcyBXb3JrUXVl dWVEZWxlZ2F0ZToKIAogCiBjbGFzcyBXb3JrUXVldWU6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYs IGRlbGVnYXRlKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZGVsZWdhdGUpOgorICAg ICAgICBzZWxmLl9uYW1lID0gbmFtZQogICAgICAgICBzZWxmLl9kZWxlZ2F0ZSA9IGRlbGVnYXRl CiAgICAgICAgIHNlbGYuX291dHB1dF90ZWUgPSBPdXRwdXRUZWUoKQogCkBAIC05NSwxMSArOTks MTEgQEAgY2xhc3MgV29ya1F1ZXVlOgogICAgICAgICAgICAgICAgIGlmIG5vdCB3b3JrX2l0ZW06 CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3VwZGF0ZV9zdGF0dXNfYW5kX3NsZWVwKCJFbXB0 eSBxdWV1ZS4iKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgICAg IChzYWZlX3RvX3Byb2NlZWQsIHdhaXRpbmdfbWVzc2FnZSwgYnVnX2lkKSA9IHNlbGYuX2RlbGVn YXRlLnNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHdvcmtfaXRlbSkKKyAgICAgICAgICAg ICAgICAoc2FmZV90b19wcm9jZWVkLCB3YWl0aW5nX21lc3NhZ2UsIHBhdGNoKSA9IHNlbGYuX2Rl bGVnYXRlLnNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHdvcmtfaXRlbSkKICAgICAgICAg ICAgICAgICBpZiBub3Qgc2FmZV90b19wcm9jZWVkOgogICAgICAgICAgICAgICAgICAgICBzZWxm Ll91cGRhdGVfc3RhdHVzX2FuZF9zbGVlcCh3YWl0aW5nX21lc3NhZ2UpCiAgICAgICAgICAgICAg ICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICAgICAgc2VsZi5zdGF0dXNfYm90LnVwZGF0ZV9z dGF0dXMod2FpdGluZ19tZXNzYWdlLCBidWdfaWQ9YnVnX2lkKQorICAgICAgICAgICAgICAgIHNl bGYuc3RhdHVzX2JvdC51cGRhdGVfc3RhdHVzKHNlbGYuX25hbWUsIHdhaXRpbmdfbWVzc2FnZSwg cGF0Y2gpCiAgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlOgogICAgICAgICAgICAgICAg ICMgRG9uJ3QgdHJ5IHRlbGwgdGhlIHN0YXR1cyBib3QsIGluIGNhc2UgdGVsbGluZyBpdCBjYXVz ZXMgYW4gZXhjZXB0aW9uLgogICAgICAgICAgICAgICAgIHNlbGYuX3NsZWVwKCJFeGNlcHRpb24g d2hpbGUgcHJlcGFyaW5nIHF1ZXVlOiAlcy4iICUgZSkK 43631 2009-11-20 16:58:27 -0800 2009-11-20 16:59:52 -0800 Remove uneeded queue_names restrictions bug-31754-20091120165826.patch text/plain 12196 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNzE1MzJkLi5hMTc3YmZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMDktMTEt MjAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlYWNoIHRoZSBTdGF0dXNCb3QgaG93IHRvIHN1 cHBvcnQgbW9yZSB0aGFuIGp1c3QgdGhlIGNvbW1pdC1xdWV1ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3NTQKKworICAgICAgICAqIENvbW1pdFF1 ZXVlU3RhdHVzL2luZGV4LnlhbWw6CisgICAgICAgICAtIEFkZCBpbmRpY2VzIHJlcXVpcmVkIGZv ciB0aGUgbmV3IHF1ZXJpZXMuCisgICAgICAgICogQ29tbWl0UXVldWVTdGF0dXMvcXVldWVfc3Rh dHVzLnB5OgorICAgICAgICAgLSBBZGQgYSBwYXRjaC1zdGF0dXMgcGFnZSBhbmQgbW92ZSB1cGRh dGVfc3RhdHVzIHRvIHVwZGF0ZS1zdGF0dXMuCisgICAgICAgICAtIE9ubHkgZGlzcGxheSAiY29t bWl0LXF1ZXVlIiBzdGF0dXMgcmVjb3JkcyBmb3IgdGhlIGNvbW1pdC1xdWV1ZS4KKyAgICAgICAg IC0gQWRkIHN1cHBvcnQgZm9yIGEgcXVldWVfbmFtZSBwcm9wZXJ0eSBvbiBzdGF0dXMgcmVjb3Jk cy4KKyAgICAgICAgIC0gRml4IF9pbnRfZnJvbV9yZXF1ZXN0IHRvIGFjdHVhbGx5IHdvcmsuCisg ICAgICAgICogQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1cy5odG1sOgorICAgICAgICAg LSBBZGQgc3VwcG9ydCBmb3IgYSBxdWV1ZV9uYW1lIG9uIHN0YXR1cyByZWNvcmRzLgorICAgICAg ICAgLSBSZW1vdmUgdW51c2VkIGxpc3Qgb2YgYnVnIGlkcy4KKyAgICAgICAgICogU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weQorICAgICAgICAgIC0gTWFrZSB0aGUgcXVldWVzIHBh c3MgdGhlIHBhdGNoIGluc3RlYWQgb2YgdGhlIGJ1Z19pZCB0byBTdGF0dXNCb3QuCisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2JvdC5weToKKyAgICAgICAgIC0gU3VwcG9ydCBwYXNz aW5nIHRoZSBxdWV1ZV9uYW1lIHRvIHRoZSBzdGF0dXMgdXBkYXRlcy4KKyAgICAgICAgIC0gU3Vw cG9ydCBmZXRjaGluZyBwYXRjaCBzdGF0dXMgd2l0aCBwYXRjaF9zdGF0dXMoKS4KKyAgICAgICAg KiBTY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5OgorICAgICAgICAgLSBQYXNzIHRoZSBwYXRj aCB0byB0aGUgU3RhdHVzQm90IGluc3RlYWQgb2YgdGhlIGJ1Z19pZC4KKyAgICAgICAgIC0gTGV0 IFdvcmtRdWV1ZXMgaGF2ZSBhIG5hbWUuCisKIDIwMDktMTEtMjAgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVlU3RhdHVzL2luZGV4LnlhbWwgYi9XZWJLaXRU b29scy9Db21taXRRdWV1ZVN0YXR1cy9pbmRleC55YW1sCmluZGV4IGEzYjllMDUuLmJmMTEyNjIg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVlU3RhdHVzL2luZGV4LnlhbWwKKysr IGIvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvaW5kZXgueWFtbApAQCAtOSwzICs5LDE2 IEBAIGluZGV4ZXM6CiAjIG1hbnVhbGx5LCBtb3ZlIHRoZW0gYWJvdmUgdGhlIG1hcmtlciBsaW5l LiAgVGhlIGluZGV4LnlhbWwgZmlsZSBpcwogIyBhdXRvbWF0aWNhbGx5IHVwbG9hZGVkIHRvIHRo ZSBhZG1pbiBjb25zb2xlIHdoZW4geW91IG5leHQgZGVwbG95CiAjIHlvdXIgYXBwbGljYXRpb24g dXNpbmcgYXBwY2ZnLnB5LgorCistIGtpbmQ6IFF1ZXVlU3RhdHVzCisgIHByb3BlcnRpZXM6Cisg IC0gbmFtZTogYWN0aXZlX3BhdGNoX2lkCisgIC0gbmFtZTogcXVldWVfbmFtZQorICAtIG5hbWU6 IGRhdGUKKyAgICBkaXJlY3Rpb246IGRlc2MKKworLSBraW5kOiBRdWV1ZVN0YXR1cworICBwcm9w ZXJ0aWVzOgorICAtIG5hbWU6IHF1ZXVlX25hbWUKKyAgLSBuYW1lOiBkYXRlCisgICAgZGlyZWN0 aW9uOiBkZXNjCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9Db21taXRRdWV1ZVN0YXR1cy9xdWV1 ZV9zdGF0dXMucHkgYi9XZWJLaXRUb29scy9Db21taXRRdWV1ZVN0YXR1cy9xdWV1ZV9zdGF0dXMu cHkKaW5kZXggMzBkMjQ5NC4uZjQ4ZTgzZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ29tbWl0 UXVldWVTdGF0dXMvcXVldWVfc3RhdHVzLnB5CisrKyBiL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVl U3RhdHVzL3F1ZXVlX3N0YXR1cy5weQpAQCAtNDEsMjMgKzQxLDM3IEBAIGZyb20gZ29vZ2xlLmFw cGVuZ2luZS5leHQgaW1wb3J0IGRiCiAKIHdlYmFwcC50ZW1wbGF0ZS5yZWdpc3Rlcl90ZW1wbGF0 ZV9saWJyYXJ5KCdmaWx0ZXJzLndlYmtpdF9leHRyYXMnKQogCisKIGNsYXNzIFF1ZXVlU3RhdHVz KGRiLk1vZGVsKToKICAgICBhdXRob3IgPSBkYi5Vc2VyUHJvcGVydHkoKQorICAgIHF1ZXVlX25h bWUgPSBkYi5TdHJpbmdQcm9wZXJ0eSgpCiAgICAgYWN0aXZlX2J1Z19pZCA9IGRiLkludGVnZXJQ cm9wZXJ0eSgpCiAgICAgYWN0aXZlX3BhdGNoX2lkID0gZGIuSW50ZWdlclByb3BlcnR5KCkKICAg ICBtZXNzYWdlID0gZGIuU3RyaW5nUHJvcGVydHkobXVsdGlsaW5lPVRydWUpCiAgICAgZGF0ZSA9 IGRiLkRhdGVUaW1lUHJvcGVydHkoYXV0b19ub3dfYWRkPVRydWUpCiAKKwogY2xhc3MgTWFpblBh Z2Uod2ViYXBwLlJlcXVlc3RIYW5kbGVyKToKICAgICBkZWYgZ2V0KHNlbGYpOgotICAgICAgICBz dGF0dXNlc19xdWVyeSA9IFF1ZXVlU3RhdHVzLmFsbCgpLm9yZGVyKCctZGF0ZScpCisgICAgICAg IHN0YXR1c2VzX3F1ZXJ5ID0gUXVldWVTdGF0dXMuYWxsKCkuZmlsdGVyKCdxdWV1ZV9uYW1lID0n LCAnY29tbWl0LXF1ZXVlJykub3JkZXIoJy1kYXRlJykKICAgICAgICAgc3RhdHVzZXMgPSBzdGF0 dXNlc19xdWVyeS5mZXRjaCg2KQorICAgICAgICBpZiBub3Qgc3RhdHVzZXM6CisgICAgICAgICAg ICByZXR1cm4gc2VsZi5yZXNwb25zZS5vdXQud3JpdGUoIk5vIHN0YXR1cyB0byByZXBvcnQuIikK ICAgICAgICAgdGVtcGxhdGVfdmFsdWVzID0gewogICAgICAgICAgICAgJ2xhc3Rfc3RhdHVzJyA6 IHN0YXR1c2VzWzBdLAogICAgICAgICAgICAgJ3JlY2VudF9zdGF0dXNlcycgOiBzdGF0dXNlc1sx Ol0sCiAgICAgICAgIH0KICAgICAgICAgc2VsZi5yZXNwb25zZS5vdXQud3JpdGUodGVtcGxhdGUu cmVuZGVyKCdpbmRleC5odG1sJywgdGVtcGxhdGVfdmFsdWVzKSkKIAorCitjbGFzcyBQYXRjaFN0 YXR1cyh3ZWJhcHAuUmVxdWVzdEhhbmRsZXIpOgorICAgIGRlZiBnZXQoc2VsZiwgcXVldWVfbmFt ZSwgYXR0YWNobWVudF9pZCk6CisgICAgICAgIHN0YXR1c2VzID0gUXVldWVTdGF0dXMuYWxsKCku ZmlsdGVyKCdxdWV1ZV9uYW1lID0nLCBxdWV1ZV9uYW1lKS5maWx0ZXIoJ2FjdGl2ZV9wYXRjaF9p ZCA9JywgYXR0YWNobWVudF9pZCkub3JkZXIoJy1kYXRlJykKKyAgICAgICAgaWYgbm90IHN0YXR1 c2VzOgorICAgICAgICAgICAgc2VsZi5lcnJvcig0MDQpCisgICAgICAgIHNlbGYucmVzcG9uc2Uu b3V0LndyaXRlKHN0YXR1c2VzWzBdLm1lc3NhZ2UpCisKKwogY2xhc3MgVXBkYXRlU3RhdHVzKHdl YmFwcC5SZXF1ZXN0SGFuZGxlcik6CiAgICAgZGVmIGdldChzZWxmKToKICAgICAgICAgc2VsZi5y ZXNwb25zZS5vdXQud3JpdGUodGVtcGxhdGUucmVuZGVyKCd1cGRhdGVfc3RhdHVzLmh0bWwnLCBO b25lKSkKQEAgLTY2LDYgKzgwLDcgQEAgY2xhc3MgVXBkYXRlU3RhdHVzKHdlYmFwcC5SZXF1ZXN0 SGFuZGxlcik6CiAgICAgICAgIHN0cmluZ192YWx1ZSA9IHNlbGYucmVxdWVzdC5nZXQobmFtZSkK ICAgICAgICAgdHJ5OgogICAgICAgICAgICAgaW50X3ZhbHVlID0gaW50KHN0cmluZ192YWx1ZSkK KyAgICAgICAgICAgIHJldHVybiBpbnRfdmFsdWUKICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3Is IFR5cGVFcnJvcjoKICAgICAgICAgICAgIHBhc3MKICAgICAgICAgcmV0dXJuIE5vbmUKQEAgLTc2 LDE1ICs5MSwxOSBAQCBjbGFzcyBVcGRhdGVTdGF0dXMod2ViYXBwLlJlcXVlc3RIYW5kbGVyKToK ICAgICAgICAgaWYgdXNlcnMuZ2V0X2N1cnJlbnRfdXNlcigpOgogICAgICAgICAgICAgcXVldWVf c3RhdHVzLmF1dGhvciA9IHVzZXJzLmdldF9jdXJyZW50X3VzZXIoKQogCisgICAgICAgIHF1ZXVl X25hbWUgPSBzZWxmLnJlcXVlc3QuZ2V0KCdxdWV1ZV9uYW1lJykKKyAgICAgICAgcXVldWVfc3Rh dHVzLnF1ZXVlX25hbWUgPSBxdWV1ZV9uYW1lCiAgICAgICAgIHF1ZXVlX3N0YXR1cy5hY3RpdmVf YnVnX2lkID0gc2VsZi5faW50X2Zyb21fcmVxdWVzdCgnYnVnX2lkJykKICAgICAgICAgcXVldWVf c3RhdHVzLmFjdGl2ZV9wYXRjaF9pZCA9IHNlbGYuX2ludF9mcm9tX3JlcXVlc3QoJ3BhdGNoX2lk JykKICAgICAgICAgcXVldWVfc3RhdHVzLm1lc3NhZ2UgPSBzZWxmLnJlcXVlc3QuZ2V0KCdzdGF0 dXMnKQogICAgICAgICBxdWV1ZV9zdGF0dXMucHV0KCkKICAgICAgICAgc2VsZi5yZWRpcmVjdCgn LycpCiAKKwogcm91dGVzID0gWwogICAgICgnLycsIE1haW5QYWdlKSwKLSAgICAoJy91cGRhdGVf c3RhdHVzJywgVXBkYXRlU3RhdHVzKQorICAgICgnL3VwZGF0ZS1zdGF0dXMnLCBVcGRhdGVTdGF0 dXMpLAorICAgIChyJy9wYXRjaC1zdGF0dXMvKC4qKS8oLiopJywgUGF0Y2hTdGF0dXMpLAogXQog CiBhcHBsaWNhdGlvbiA9IHdlYmFwcC5XU0dJQXBwbGljYXRpb24ocm91dGVzLCBkZWJ1Zz1UcnVl KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1 cy5odG1sIGIvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1cy5odG1s CmluZGV4IGVkYWZiYTQuLmVhYzZjNTggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NvbW1pdFF1 ZXVlU3RhdHVzL3VwZGF0ZV9zdGF0dXMuaHRtbAorKysgYi9XZWJLaXRUb29scy9Db21taXRRdWV1 ZVN0YXR1cy91cGRhdGVfc3RhdHVzLmh0bWwKQEAgLTEsNSArMSwxMCBAQAotVXBkYXRlIHRoZSBj dXJyZW50IHN0YXR1cyBvZiB0aGUgY29tbWl0LXF1ZXVlOgogPGZvcm0gbmFtZT0idXBkYXRlX3N0 YXR1cyIgbWV0aG9kPSJwb3N0Ij4KK1VwZGF0ZSBzdGF0dXMgZm9yIGEgcXVldWU6CisgPHNlbGVj dCBuYW1lPSJxdWV1ZV9uYW1lIj4KKyAgICB7JSBmb3IgcXVldWVfbmFtZSBpbiBxdWV1ZV9uYW1l cyAlfQorICAgIDxvcHRpb24+e3sgcXVldWVfbmFtZSB9fTwvb3B0aW9uPgorICAgIHslIGVuZGZv ciAlfQorIDwvc2VsZWN0PgogIDxkaXY+CiAgICAgIEFjdGl2ZSBCdWcgSWQ6CiAgICAgPGlucHV0 IG5hbWU9ImJ1Z19pZCI+CkBAIC04LDExICsxMyw4IEBAIFVwZGF0ZSB0aGUgY3VycmVudCBzdGF0 dXMgb2YgdGhlIGNvbW1pdC1xdWV1ZToKICAgICAgQWN0aXZlIFBhdGNoIElkOgogICAgIDxpbnB1 dCBuYW1lPSJwYXRjaF9pZCI+CiAgPC9kaXY+Ci0gPGRpdj4KLSAgICAgU3BhY2Ugc2VwYXJhdGVk IGxpc3Qgb2Ygb3RoZXIgYnVncyBpbiBxdWV1ZToKLSAgICA8aW5wdXQgbmFtZT0iYnVnc19pbl9x dWV1ZSI+Ci0gPC9kaXY+CiAgIDxkaXY+CisgICAgICBTdGF0dXMgVGV4dDo8YnI+CiAgICAgICA8 dGV4dGFyZWEgbmFtZT0ic3RhdHVzIiByb3dzPSIzIiBjb2xzPSI2MCI+PC90ZXh0YXJlYT4KICAg PC9kaXY+CiAgIDxkaXY+PGlucHV0IHR5cGU9InN1Ym1pdCIgdmFsdWU9IkFkZCBTdGF0dXMiPjwv ZGl2PgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1 ZXVlcy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXMucHkK aW5kZXggY2JkNGY4Zi4uN2VkZDcwZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvY29tbWFuZHMvcXVldWVzLnB5CkBAIC0xMDYsNyArMTA2LDcgQEAgY2xhc3MgQWJzdHJhY3RR dWV1ZShDb21tYW5kLCBXb3JrUXVldWVEZWxlZ2F0ZSk6CiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwg b3B0aW9ucywgYXJncywgdG9vbCk6CiAgICAgICAgIHNlbGYub3B0aW9ucyA9IG9wdGlvbnMKICAg ICAgICAgc2VsZi50b29sID0gdG9vbAotICAgICAgICB3b3JrX3F1ZXVlID0gV29ya1F1ZXVlKHNl bGYpCisgICAgICAgIHdvcmtfcXVldWUgPSBXb3JrUXVldWUoc2VsZiwgc2VsZi5uYW1lKQogICAg ICAgICB3b3JrX3F1ZXVlLnJ1bigpCiAKIApAQCAtMTMxLDcgKzEzMSw3IEBAIGNsYXNzIENvbW1p dFF1ZXVlKEFic3RyYWN0UXVldWUpOgogICAgICAgICBpZiByZWRfYnVpbGRlcnNfbmFtZXM6CiAg ICAgICAgICAgICByZWRfYnVpbGRlcnNfbmFtZXMgPSBtYXAobGFtYmRhIG5hbWU6ICJcIiVzXCIi ICUgbmFtZSwgcmVkX2J1aWxkZXJzX25hbWVzKSAjIEFkZCBxdW90ZXMgYXJvdW5kIHRoZSBuYW1l cy4KICAgICAgICAgICAgIHJldHVybiAoRmFsc2UsICJCdWlsZGVycyBbJXNdIGFyZSByZWQuIFNl ZSBodHRwOi8vYnVpbGQud2Via2l0Lm9yZy4iICUgIiwgIi5qb2luKHJlZF9idWlsZGVyc19uYW1l cyksIE5vbmUpCi0gICAgICAgIHJldHVybiAoVHJ1ZSwgIkxhbmRpbmcgcGF0Y2ggJXMgZnJvbSBi dWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJdKSwgcGF0Y2hbImJ1Z19pZCJd KQorICAgICAgICByZXR1cm4gKFRydWUsICJMYW5kaW5nIHBhdGNoICVzIGZyb20gYnVnICVzLiIg JSAocGF0Y2hbImlkIl0sIHBhdGNoWyJidWdfaWQiXSksIHBhdGNoKQogCiAgICAgZGVmIHByb2Nl c3Nfd29ya19pdGVtKHNlbGYsIHBhdGNoKToKICAgICAgICAgc2VsZi5ydW5fYnVnemlsbGFfdG9v bChbImxhbmQtYXR0YWNobWVudCIsICItLWZvcmNlLWNsZWFuIiwgIi0tbm9uLWludGVyYWN0aXZl IiwgIi0tcXVpZXQiLCBwYXRjaFsiaWQiXV0pCkBAIC0xNzIsNyArMTcyLDcgQEAgY2xhc3MgU3R5 bGVRdWV1ZShBYnN0cmFjdFRyeVF1ZXVlKToKICAgICAgICAgQWJzdHJhY3RUcnlRdWV1ZS5fX2lu aXRfXyhzZWxmKQogCiAgICAgZGVmIHNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHNlbGYs IHBhdGNoKToKLSAgICAgICAgcmV0dXJuIChUcnVlLCAiQ2hlY2tpbmcgc3R5bGUgZm9yIHBhdGNo ICVzIG9uIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaFsi YnVnX2lkIl0pCisgICAgICAgIHJldHVybiAoVHJ1ZSwgIkNoZWNraW5nIHN0eWxlIGZvciBwYXRj aCAlcyBvbiBidWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJdKSwgcGF0Y2gp CiAKICAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgogICAgICAgICBzZWxm LnJ1bl9idWd6aWxsYV90b29sKFsiY2hlY2stc3R5bGUiLCAiLS1mb3JjZS1jbGVhbiIsIHBhdGNo WyJpZCJdXSkKQEAgLTE5Myw3ICsxOTMsNyBAQCBjbGFzcyBCdWlsZFF1ZXVlKEFic3RyYWN0VHJ5 UXVldWUpOgogICAgICAgICAgICAgc2VsZi5ydW5fYnVnemlsbGFfdG9vbChbImJ1aWxkIiwgc2Vs Zi5wb3J0LmZsYWcoKSwgIi0tZm9yY2UtY2xlYW4iLCAiLS1xdWlldCJdKQogICAgICAgICBleGNl cHQgU2NyaXB0RXJyb3IsIGU6CiAgICAgICAgICAgICByZXR1cm4gKEZhbHNlLCAiVW5hYmxlIHRv IHBlcmZvcm0gYSBidWlsZC4iLCBOb25lKQotICAgICAgICByZXR1cm4gKFRydWUsICJCdWlsZGlu ZyBwYXRjaCAlcyBvbiBidWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJdKSwg cGF0Y2hbImJ1Z19pZCJdKQorICAgICAgICByZXR1cm4gKFRydWUsICJCdWlsZGluZyBwYXRjaCAl cyBvbiBidWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJdKSwgcGF0Y2gpCiAK ICAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgogICAgICAgICBzZWxmLnJ1 bl9idWd6aWxsYV90b29sKFsiYnVpbGQtYXR0YWNobWVudCIsIHNlbGYucG9ydC5mbGFnKCksICIt LWZvcmNlLWNsZWFuIiwgIi0tcXVpZXQiLCAiLS1uby11cGRhdGUiLCBwYXRjaFsiaWQiXV0pCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc3RhdHVzYm90LnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2JvdC5weQppbmRleCBkOWI1NGIzLi4wNDg1 MjdhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc3RhdHVzYm90LnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zdGF0dXNib3QucHkKQEAgLTQ2LDI0 ICs0NiwzOSBAQCBodHRwOi8vd3d3c2VhcmNoLnNvdXJjZWZvcmdlLm5ldC9tZWNoYW5pemUvCiAi IiIKICAgICBleGl0KDEpCiAKK2ltcG9ydCB1cmxsaWIyCisKKwogY2xhc3MgU3RhdHVzQm90Ogog ICAgIGRlZmF1bHRfaG9zdCA9ICJ3ZWJraXQtY29tbWl0LXF1ZXVlLmFwcHNwb3QuY29tIgogCiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3Q9ZGVmYXVsdF9ob3N0KToKICAgICAgICAgc2VsZi5z dGF0dXNib3RfaG9zdCA9IGhvc3QKICAgICAgICAgc2VsZi5zdGF0dXNib3Rfc2VydmVyX3VybCA9 ICJodHRwOi8vJXMiICUgc2VsZi5zdGF0dXNib3RfaG9zdAotICAgICAgICBzZWxmLnVwZGF0ZV9z dGF0dXNfdXJsID0gIiVzL3VwZGF0ZV9zdGF0dXMiICUgc2VsZi5zdGF0dXNib3Rfc2VydmVyX3Vy bAogICAgICAgICBzZWxmLmJyb3dzZXIgPSBCcm93c2VyKCkKIAotICAgIGRlZiB1cGRhdGVfc3Rh dHVzKHNlbGYsIHN0YXR1cywgYnVnX2lkPU5vbmUsIHBhdGNoX2lkPU5vbmUpOgorICAgIGRlZiB1 cGRhdGVfc3RhdHVzKHNlbGYsIHF1ZXVlX25hbWUsIHN0YXR1cywgcGF0Y2gpOgogICAgICAgICAj IER1cmluZyB1bml0IHRlc3RpbmcsIHN0YXR1c2JvdF9ob3N0IGlzIE5vbmUKICAgICAgICAgaWYg bm90IHNlbGYuc3RhdHVzYm90X2hvc3Q6CiAgICAgICAgICAgICByZXR1cm4KLSAgICAgICAgc2Vs Zi5icm93c2VyLm9wZW4oc2VsZi51cGRhdGVfc3RhdHVzX3VybCkKKworICAgICAgICB1cGRhdGVf c3RhdHVzX3VybCA9ICIlcy91cGRhdGUtc3RhdHVzIiAlIHNlbGYuc3RhdHVzYm90X3NlcnZlcl91 cmwKKyAgICAgICAgc2VsZi5icm93c2VyLm9wZW4odXBkYXRlX3N0YXR1c191cmwpCiAgICAgICAg IHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9ybShuYW1lPSJ1cGRhdGVfc3RhdHVzIikKLSAgICAgICAg aWYgYnVnX2lkOgotICAgICAgICAgICAgc2VsZi5icm93c2VyWydidWdfaWQnXSA9IHN0cihidWdf aWQpCi0gICAgICAgIGlmIHBhdGNoX2lkOgotICAgICAgICAgICAgc2VsZi5icm93c2VyWydwYXRj aF9pZCddID0gc3RyKHBhdGNoX2lkKQorICAgICAgICBzZWxmLmJyb3dzZXJbJ3F1ZXVlX25hbWUn XSA9IHF1ZXVlX25hbWUKKyAgICAgICAgaWYgcGF0Y2g6CisgICAgICAgICAgICBpZiBwYXRjaC5n ZXQoJ2J1Z19pZCcpOgorICAgICAgICAgICAgICAgIHNlbGYuYnJvd3NlclsnYnVnX2lkJ10gPSBz dHIocGF0Y2hbJ2J1Z19pZCddKQorICAgICAgICAgICAgaWYgcGF0Y2guZ2V0KCdpZCcpOgorICAg ICAgICAgICAgICAgIHNlbGYuYnJvd3NlclsncGF0Y2hfaWQnXSA9IHN0cihwYXRjaFsnaWQnXSkK ICAgICAgICAgc2VsZi5icm93c2VyWydzdGF0dXMnXSA9IHN0YXR1cwogICAgICAgICBzZWxmLmJy b3dzZXIuc3VibWl0KCkKKworICAgIGRlZiBwYXRjaF9zdGF0dXMoc2VsZiwgcXVldWVfbmFtZSwg cGF0Y2hfaWQpOgorICAgICAgICB1cGRhdGVfc3RhdHVzX3VybCA9ICIlcy9wYXRjaC1zdGF0dXMv JXMvJXMiICUgKHNlbGYuc3RhdHVzYm90X3NlcnZlcl91cmwsIHF1ZXVlX25hbWUsIHBhdGNoX2lk KQorICAgICAgICB0cnk6CisgICAgICAgICAgICByZXR1cm4gdXJsbGliMi51cmxvcGVuKHVwZGF0 ZV9zdGF0dXNfdXJsKS5yZWFkKCkKKyAgICAgICAgZXhjZXB0IHVybGxpYjIuSFRUUEVycm9yLCBl OgorICAgICAgICAgICAgaWYgZS5jb2RlID09IDQwNDoKKyAgICAgICAgICAgICAgICByZXR1cm4g Tm9uZQorICAgICAgICAgICAgcmFpc2UgZQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL3dvcmtxdWV1ZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93b3Jr cXVldWUucHkKaW5kZXggOGU3MTQ4MS4uOTk3YzhiNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvd29ya3F1ZXVlLnB5CkBAIC0zOCw2ICszOCw5IEBAIGZyb20gbW9kdWxlcy5zY20gaW1w b3J0IFNjcmlwdEVycm9yCiBmcm9tIG1vZHVsZXMuc3RhdHVzYm90IGltcG9ydCBTdGF0dXNCb3QK IAogY2xhc3MgV29ya1F1ZXVlRGVsZWdhdGU6CisgICAgZGVmIHF1ZXVlX25hbWUoc2VsZik6Cisg ICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3QgaW1wbGVt ZW50IgorCiAgICAgZGVmIHF1ZXVlX2xvZ19wYXRoKHNlbGYpOgogICAgICAgICByYWlzZSBOb3RJ bXBsZW1lbnRlZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIKIApAQCAtNTcsNyAr NjAsNyBAQCBjbGFzcyBXb3JrUXVldWVEZWxlZ2F0ZToKICAgICAgICAgcmFpc2UgTm90SW1wbGVt ZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCiAKICAgICBkZWYgc2hvdWxk X3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwgd29ya19pdGVtKToKLSAgICAgICAgIyByZXR1 cm5zIChzYWZlX3RvX3Byb2NlZWQsIHdhaXRpbmdfbWVzc2FnZSwgYnVnX2lkKQorICAgICAgICAj IHJldHVybnMgKHNhZmVfdG9fcHJvY2VlZCwgd2FpdGluZ19tZXNzYWdlLCBwYXRjaCkKICAgICAg ICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQi CiAKICAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgd29ya19pdGVtKToKQEAgLTY4LDcg KzcxLDggQEAgY2xhc3MgV29ya1F1ZXVlRGVsZWdhdGU6CiAKIAogY2xhc3MgV29ya1F1ZXVlOgot ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBkZWxlZ2F0ZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYs IG5hbWUsIGRlbGVnYXRlKToKKyAgICAgICAgc2VsZi5fbmFtZSA9IG5hbWUKICAgICAgICAgc2Vs Zi5fZGVsZWdhdGUgPSBkZWxlZ2F0ZQogICAgICAgICBzZWxmLl9vdXRwdXRfdGVlID0gT3V0cHV0 VGVlKCkKIApAQCAtOTUsMTEgKzk5LDExIEBAIGNsYXNzIFdvcmtRdWV1ZToKICAgICAgICAgICAg ICAgICBpZiBub3Qgd29ya19pdGVtOgogICAgICAgICAgICAgICAgICAgICBzZWxmLl91cGRhdGVf c3RhdHVzX2FuZF9zbGVlcCgiRW1wdHkgcXVldWUuIikKICAgICAgICAgICAgICAgICAgICAgY29u dGludWUKLSAgICAgICAgICAgICAgICAoc2FmZV90b19wcm9jZWVkLCB3YWl0aW5nX21lc3NhZ2Us IGJ1Z19pZCkgPSBzZWxmLl9kZWxlZ2F0ZS5zaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSh3 b3JrX2l0ZW0pCisgICAgICAgICAgICAgICAgKHNhZmVfdG9fcHJvY2VlZCwgd2FpdGluZ19tZXNz YWdlLCBwYXRjaCkgPSBzZWxmLl9kZWxlZ2F0ZS5zaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRl bSh3b3JrX2l0ZW0pCiAgICAgICAgICAgICAgICAgaWYgbm90IHNhZmVfdG9fcHJvY2VlZDoKICAg ICAgICAgICAgICAgICAgICAgc2VsZi5fdXBkYXRlX3N0YXR1c19hbmRfc2xlZXAod2FpdGluZ19t ZXNzYWdlKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgICAgIHNl bGYuc3RhdHVzX2JvdC51cGRhdGVfc3RhdHVzKHdhaXRpbmdfbWVzc2FnZSwgYnVnX2lkPWJ1Z19p ZCkKKyAgICAgICAgICAgICAgICBzZWxmLnN0YXR1c19ib3QudXBkYXRlX3N0YXR1cyhzZWxmLl9u YW1lLCB3YWl0aW5nX21lc3NhZ2UsIHBhdGNoKQogICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlv biwgZToKICAgICAgICAgICAgICAgICAjIERvbid0IHRyeSB0ZWxsIHRoZSBzdGF0dXMgYm90LCBp biBjYXNlIHRlbGxpbmcgaXQgY2F1c2VzIGFuIGV4Y2VwdGlvbi4KICAgICAgICAgICAgICAgICBz ZWxmLl9zbGVlcCgiRXhjZXB0aW9uIHdoaWxlIHByZXBhcmluZyBxdWV1ZTogJXMuIiAlIGUpCg== 43632 2009-11-20 17:00:03 -0800 2009-11-20 17:01:28 -0800 Fix update_status.html bug-31754-20091120170002.patch text/plain 12081 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNzE1MzJkLi5hMTc3YmZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMDktMTEt MjAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlYWNoIHRoZSBTdGF0dXNCb3QgaG93IHRvIHN1 cHBvcnQgbW9yZSB0aGFuIGp1c3QgdGhlIGNvbW1pdC1xdWV1ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3NTQKKworICAgICAgICAqIENvbW1pdFF1 ZXVlU3RhdHVzL2luZGV4LnlhbWw6CisgICAgICAgICAtIEFkZCBpbmRpY2VzIHJlcXVpcmVkIGZv ciB0aGUgbmV3IHF1ZXJpZXMuCisgICAgICAgICogQ29tbWl0UXVldWVTdGF0dXMvcXVldWVfc3Rh dHVzLnB5OgorICAgICAgICAgLSBBZGQgYSBwYXRjaC1zdGF0dXMgcGFnZSBhbmQgbW92ZSB1cGRh dGVfc3RhdHVzIHRvIHVwZGF0ZS1zdGF0dXMuCisgICAgICAgICAtIE9ubHkgZGlzcGxheSAiY29t bWl0LXF1ZXVlIiBzdGF0dXMgcmVjb3JkcyBmb3IgdGhlIGNvbW1pdC1xdWV1ZS4KKyAgICAgICAg IC0gQWRkIHN1cHBvcnQgZm9yIGEgcXVldWVfbmFtZSBwcm9wZXJ0eSBvbiBzdGF0dXMgcmVjb3Jk cy4KKyAgICAgICAgIC0gRml4IF9pbnRfZnJvbV9yZXF1ZXN0IHRvIGFjdHVhbGx5IHdvcmsuCisg ICAgICAgICogQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1cy5odG1sOgorICAgICAgICAg LSBBZGQgc3VwcG9ydCBmb3IgYSBxdWV1ZV9uYW1lIG9uIHN0YXR1cyByZWNvcmRzLgorICAgICAg ICAgLSBSZW1vdmUgdW51c2VkIGxpc3Qgb2YgYnVnIGlkcy4KKyAgICAgICAgICogU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weQorICAgICAgICAgIC0gTWFrZSB0aGUgcXVldWVzIHBh c3MgdGhlIHBhdGNoIGluc3RlYWQgb2YgdGhlIGJ1Z19pZCB0byBTdGF0dXNCb3QuCisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2JvdC5weToKKyAgICAgICAgIC0gU3VwcG9ydCBwYXNz aW5nIHRoZSBxdWV1ZV9uYW1lIHRvIHRoZSBzdGF0dXMgdXBkYXRlcy4KKyAgICAgICAgIC0gU3Vw cG9ydCBmZXRjaGluZyBwYXRjaCBzdGF0dXMgd2l0aCBwYXRjaF9zdGF0dXMoKS4KKyAgICAgICAg KiBTY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5OgorICAgICAgICAgLSBQYXNzIHRoZSBwYXRj aCB0byB0aGUgU3RhdHVzQm90IGluc3RlYWQgb2YgdGhlIGJ1Z19pZC4KKyAgICAgICAgIC0gTGV0 IFdvcmtRdWV1ZXMgaGF2ZSBhIG5hbWUuCisKIDIwMDktMTEtMjAgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVlU3RhdHVzL2luZGV4LnlhbWwgYi9XZWJLaXRU b29scy9Db21taXRRdWV1ZVN0YXR1cy9pbmRleC55YW1sCmluZGV4IGEzYjllMDUuLmJmMTEyNjIg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVlU3RhdHVzL2luZGV4LnlhbWwKKysr IGIvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvaW5kZXgueWFtbApAQCAtOSwzICs5LDE2 IEBAIGluZGV4ZXM6CiAjIG1hbnVhbGx5LCBtb3ZlIHRoZW0gYWJvdmUgdGhlIG1hcmtlciBsaW5l LiAgVGhlIGluZGV4LnlhbWwgZmlsZSBpcwogIyBhdXRvbWF0aWNhbGx5IHVwbG9hZGVkIHRvIHRo ZSBhZG1pbiBjb25zb2xlIHdoZW4geW91IG5leHQgZGVwbG95CiAjIHlvdXIgYXBwbGljYXRpb24g dXNpbmcgYXBwY2ZnLnB5LgorCistIGtpbmQ6IFF1ZXVlU3RhdHVzCisgIHByb3BlcnRpZXM6Cisg IC0gbmFtZTogYWN0aXZlX3BhdGNoX2lkCisgIC0gbmFtZTogcXVldWVfbmFtZQorICAtIG5hbWU6 IGRhdGUKKyAgICBkaXJlY3Rpb246IGRlc2MKKworLSBraW5kOiBRdWV1ZVN0YXR1cworICBwcm9w ZXJ0aWVzOgorICAtIG5hbWU6IHF1ZXVlX25hbWUKKyAgLSBuYW1lOiBkYXRlCisgICAgZGlyZWN0 aW9uOiBkZXNjCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9Db21taXRRdWV1ZVN0YXR1cy9xdWV1 ZV9zdGF0dXMucHkgYi9XZWJLaXRUb29scy9Db21taXRRdWV1ZVN0YXR1cy9xdWV1ZV9zdGF0dXMu cHkKaW5kZXggMzBkMjQ5NC4uZjQ4ZTgzZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ29tbWl0 UXVldWVTdGF0dXMvcXVldWVfc3RhdHVzLnB5CisrKyBiL1dlYktpdFRvb2xzL0NvbW1pdFF1ZXVl U3RhdHVzL3F1ZXVlX3N0YXR1cy5weQpAQCAtNDEsMjMgKzQxLDM3IEBAIGZyb20gZ29vZ2xlLmFw cGVuZ2luZS5leHQgaW1wb3J0IGRiCiAKIHdlYmFwcC50ZW1wbGF0ZS5yZWdpc3Rlcl90ZW1wbGF0 ZV9saWJyYXJ5KCdmaWx0ZXJzLndlYmtpdF9leHRyYXMnKQogCisKIGNsYXNzIFF1ZXVlU3RhdHVz KGRiLk1vZGVsKToKICAgICBhdXRob3IgPSBkYi5Vc2VyUHJvcGVydHkoKQorICAgIHF1ZXVlX25h bWUgPSBkYi5TdHJpbmdQcm9wZXJ0eSgpCiAgICAgYWN0aXZlX2J1Z19pZCA9IGRiLkludGVnZXJQ cm9wZXJ0eSgpCiAgICAgYWN0aXZlX3BhdGNoX2lkID0gZGIuSW50ZWdlclByb3BlcnR5KCkKICAg ICBtZXNzYWdlID0gZGIuU3RyaW5nUHJvcGVydHkobXVsdGlsaW5lPVRydWUpCiAgICAgZGF0ZSA9 IGRiLkRhdGVUaW1lUHJvcGVydHkoYXV0b19ub3dfYWRkPVRydWUpCiAKKwogY2xhc3MgTWFpblBh Z2Uod2ViYXBwLlJlcXVlc3RIYW5kbGVyKToKICAgICBkZWYgZ2V0KHNlbGYpOgotICAgICAgICBz dGF0dXNlc19xdWVyeSA9IFF1ZXVlU3RhdHVzLmFsbCgpLm9yZGVyKCctZGF0ZScpCisgICAgICAg IHN0YXR1c2VzX3F1ZXJ5ID0gUXVldWVTdGF0dXMuYWxsKCkuZmlsdGVyKCdxdWV1ZV9uYW1lID0n LCAnY29tbWl0LXF1ZXVlJykub3JkZXIoJy1kYXRlJykKICAgICAgICAgc3RhdHVzZXMgPSBzdGF0 dXNlc19xdWVyeS5mZXRjaCg2KQorICAgICAgICBpZiBub3Qgc3RhdHVzZXM6CisgICAgICAgICAg ICByZXR1cm4gc2VsZi5yZXNwb25zZS5vdXQud3JpdGUoIk5vIHN0YXR1cyB0byByZXBvcnQuIikK ICAgICAgICAgdGVtcGxhdGVfdmFsdWVzID0gewogICAgICAgICAgICAgJ2xhc3Rfc3RhdHVzJyA6 IHN0YXR1c2VzWzBdLAogICAgICAgICAgICAgJ3JlY2VudF9zdGF0dXNlcycgOiBzdGF0dXNlc1sx Ol0sCiAgICAgICAgIH0KICAgICAgICAgc2VsZi5yZXNwb25zZS5vdXQud3JpdGUodGVtcGxhdGUu cmVuZGVyKCdpbmRleC5odG1sJywgdGVtcGxhdGVfdmFsdWVzKSkKIAorCitjbGFzcyBQYXRjaFN0 YXR1cyh3ZWJhcHAuUmVxdWVzdEhhbmRsZXIpOgorICAgIGRlZiBnZXQoc2VsZiwgcXVldWVfbmFt ZSwgYXR0YWNobWVudF9pZCk6CisgICAgICAgIHN0YXR1c2VzID0gUXVldWVTdGF0dXMuYWxsKCku ZmlsdGVyKCdxdWV1ZV9uYW1lID0nLCBxdWV1ZV9uYW1lKS5maWx0ZXIoJ2FjdGl2ZV9wYXRjaF9p ZCA9JywgYXR0YWNobWVudF9pZCkub3JkZXIoJy1kYXRlJykKKyAgICAgICAgaWYgbm90IHN0YXR1 c2VzOgorICAgICAgICAgICAgc2VsZi5lcnJvcig0MDQpCisgICAgICAgIHNlbGYucmVzcG9uc2Uu b3V0LndyaXRlKHN0YXR1c2VzWzBdLm1lc3NhZ2UpCisKKwogY2xhc3MgVXBkYXRlU3RhdHVzKHdl YmFwcC5SZXF1ZXN0SGFuZGxlcik6CiAgICAgZGVmIGdldChzZWxmKToKICAgICAgICAgc2VsZi5y ZXNwb25zZS5vdXQud3JpdGUodGVtcGxhdGUucmVuZGVyKCd1cGRhdGVfc3RhdHVzLmh0bWwnLCBO b25lKSkKQEAgLTY2LDYgKzgwLDcgQEAgY2xhc3MgVXBkYXRlU3RhdHVzKHdlYmFwcC5SZXF1ZXN0 SGFuZGxlcik6CiAgICAgICAgIHN0cmluZ192YWx1ZSA9IHNlbGYucmVxdWVzdC5nZXQobmFtZSkK ICAgICAgICAgdHJ5OgogICAgICAgICAgICAgaW50X3ZhbHVlID0gaW50KHN0cmluZ192YWx1ZSkK KyAgICAgICAgICAgIHJldHVybiBpbnRfdmFsdWUKICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3Is IFR5cGVFcnJvcjoKICAgICAgICAgICAgIHBhc3MKICAgICAgICAgcmV0dXJuIE5vbmUKQEAgLTc2 LDE1ICs5MSwxOSBAQCBjbGFzcyBVcGRhdGVTdGF0dXMod2ViYXBwLlJlcXVlc3RIYW5kbGVyKToK ICAgICAgICAgaWYgdXNlcnMuZ2V0X2N1cnJlbnRfdXNlcigpOgogICAgICAgICAgICAgcXVldWVf c3RhdHVzLmF1dGhvciA9IHVzZXJzLmdldF9jdXJyZW50X3VzZXIoKQogCisgICAgICAgIHF1ZXVl X25hbWUgPSBzZWxmLnJlcXVlc3QuZ2V0KCdxdWV1ZV9uYW1lJykKKyAgICAgICAgcXVldWVfc3Rh dHVzLnF1ZXVlX25hbWUgPSBxdWV1ZV9uYW1lCiAgICAgICAgIHF1ZXVlX3N0YXR1cy5hY3RpdmVf YnVnX2lkID0gc2VsZi5faW50X2Zyb21fcmVxdWVzdCgnYnVnX2lkJykKICAgICAgICAgcXVldWVf c3RhdHVzLmFjdGl2ZV9wYXRjaF9pZCA9IHNlbGYuX2ludF9mcm9tX3JlcXVlc3QoJ3BhdGNoX2lk JykKICAgICAgICAgcXVldWVfc3RhdHVzLm1lc3NhZ2UgPSBzZWxmLnJlcXVlc3QuZ2V0KCdzdGF0 dXMnKQogICAgICAgICBxdWV1ZV9zdGF0dXMucHV0KCkKICAgICAgICAgc2VsZi5yZWRpcmVjdCgn LycpCiAKKwogcm91dGVzID0gWwogICAgICgnLycsIE1haW5QYWdlKSwKLSAgICAoJy91cGRhdGVf c3RhdHVzJywgVXBkYXRlU3RhdHVzKQorICAgICgnL3VwZGF0ZS1zdGF0dXMnLCBVcGRhdGVTdGF0 dXMpLAorICAgIChyJy9wYXRjaC1zdGF0dXMvKC4qKS8oLiopJywgUGF0Y2hTdGF0dXMpLAogXQog CiBhcHBsaWNhdGlvbiA9IHdlYmFwcC5XU0dJQXBwbGljYXRpb24ocm91dGVzLCBkZWJ1Zz1UcnVl KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1 cy5odG1sIGIvV2ViS2l0VG9vbHMvQ29tbWl0UXVldWVTdGF0dXMvdXBkYXRlX3N0YXR1cy5odG1s CmluZGV4IGVkYWZiYTQuLjMxZTI2MTUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NvbW1pdFF1 ZXVlU3RhdHVzL3VwZGF0ZV9zdGF0dXMuaHRtbAorKysgYi9XZWJLaXRUb29scy9Db21taXRRdWV1 ZVN0YXR1cy91cGRhdGVfc3RhdHVzLmh0bWwKQEAgLTEsNSArMSw1IEBACi1VcGRhdGUgdGhlIGN1 cnJlbnQgc3RhdHVzIG9mIHRoZSBjb21taXQtcXVldWU6CiA8Zm9ybSBuYW1lPSJ1cGRhdGVfc3Rh dHVzIiBtZXRob2Q9InBvc3QiPgorVXBkYXRlIHN0YXR1cyBmb3IgYSBxdWV1ZTogPGlucHV0IG5h bWU9InF1ZXVlX25hbWUiPgogIDxkaXY+CiAgICAgIEFjdGl2ZSBCdWcgSWQ6CiAgICAgPGlucHV0 IG5hbWU9ImJ1Z19pZCI+CkBAIC04LDExICs4LDggQEAgVXBkYXRlIHRoZSBjdXJyZW50IHN0YXR1 cyBvZiB0aGUgY29tbWl0LXF1ZXVlOgogICAgICBBY3RpdmUgUGF0Y2ggSWQ6CiAgICAgPGlucHV0 IG5hbWU9InBhdGNoX2lkIj4KICA8L2Rpdj4KLSA8ZGl2PgotICAgICBTcGFjZSBzZXBhcmF0ZWQg bGlzdCBvZiBvdGhlciBidWdzIGluIHF1ZXVlOgotICAgIDxpbnB1dCBuYW1lPSJidWdzX2luX3F1 ZXVlIj4KLSA8L2Rpdj4KICAgPGRpdj4KKyAgICAgIFN0YXR1cyBUZXh0Ojxicj4KICAgICAgIDx0 ZXh0YXJlYSBuYW1lPSJzdGF0dXMiIHJvd3M9IjMiIGNvbHM9IjYwIj48L3RleHRhcmVhPgogICA8 L2Rpdj4KICAgPGRpdj48aW5wdXQgdHlwZT0ic3VibWl0IiB2YWx1ZT0iQWRkIFN0YXR1cyI+PC9k aXY+CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVl dWVzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weQpp bmRleCBjYmQ0ZjhmLi43ZWRkNzBkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY29tbWFuZHMvcXVldWVzLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9jb21tYW5kcy9xdWV1ZXMucHkKQEAgLTEwNiw3ICsxMDYsNyBAQCBjbGFzcyBBYnN0cmFjdFF1 ZXVlKENvbW1hbmQsIFdvcmtRdWV1ZURlbGVnYXRlKToKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBv cHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgc2VsZi5vcHRpb25zID0gb3B0aW9ucwogICAg ICAgICBzZWxmLnRvb2wgPSB0b29sCi0gICAgICAgIHdvcmtfcXVldWUgPSBXb3JrUXVldWUoc2Vs ZikKKyAgICAgICAgd29ya19xdWV1ZSA9IFdvcmtRdWV1ZShzZWxmLCBzZWxmLm5hbWUpCiAgICAg ICAgIHdvcmtfcXVldWUucnVuKCkKIAogCkBAIC0xMzEsNyArMTMxLDcgQEAgY2xhc3MgQ29tbWl0 UXVldWUoQWJzdHJhY3RRdWV1ZSk6CiAgICAgICAgIGlmIHJlZF9idWlsZGVyc19uYW1lczoKICAg ICAgICAgICAgIHJlZF9idWlsZGVyc19uYW1lcyA9IG1hcChsYW1iZGEgbmFtZTogIlwiJXNcIiIg JSBuYW1lLCByZWRfYnVpbGRlcnNfbmFtZXMpICMgQWRkIHF1b3RlcyBhcm91bmQgdGhlIG5hbWVz LgogICAgICAgICAgICAgcmV0dXJuIChGYWxzZSwgIkJ1aWxkZXJzIFslc10gYXJlIHJlZC4gU2Vl IGh0dHA6Ly9idWlsZC53ZWJraXQub3JnLiIgJSAiLCAiLmpvaW4ocmVkX2J1aWxkZXJzX25hbWVz KSwgTm9uZSkKLSAgICAgICAgcmV0dXJuIChUcnVlLCAiTGFuZGluZyBwYXRjaCAlcyBmcm9tIGJ1 ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaFsiYnVnX2lkIl0p CisgICAgICAgIHJldHVybiAoVHJ1ZSwgIkxhbmRpbmcgcGF0Y2ggJXMgZnJvbSBidWcgJXMuIiAl IChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJdKSwgcGF0Y2gpCiAKICAgICBkZWYgcHJvY2Vz c193b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgogICAgICAgICBzZWxmLnJ1bl9idWd6aWxsYV90b29s KFsibGFuZC1hdHRhY2htZW50IiwgIi0tZm9yY2UtY2xlYW4iLCAiLS1ub24taW50ZXJhY3RpdmUi LCAiLS1xdWlldCIsIHBhdGNoWyJpZCJdXSkKQEAgLTE3Miw3ICsxNzIsNyBAQCBjbGFzcyBTdHls ZVF1ZXVlKEFic3RyYWN0VHJ5UXVldWUpOgogICAgICAgICBBYnN0cmFjdFRyeVF1ZXVlLl9faW5p dF9fKHNlbGYpCiAKICAgICBkZWYgc2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwg cGF0Y2gpOgotICAgICAgICByZXR1cm4gKFRydWUsICJDaGVja2luZyBzdHlsZSBmb3IgcGF0Y2gg JXMgb24gYnVnICVzLiIgJSAocGF0Y2hbImlkIl0sIHBhdGNoWyJidWdfaWQiXSksIHBhdGNoWyJi dWdfaWQiXSkKKyAgICAgICAgcmV0dXJuIChUcnVlLCAiQ2hlY2tpbmcgc3R5bGUgZm9yIHBhdGNo ICVzIG9uIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaCkK IAogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBwYXRjaCk6CiAgICAgICAgIHNlbGYu cnVuX2J1Z3ppbGxhX3Rvb2woWyJjaGVjay1zdHlsZSIsICItLWZvcmNlLWNsZWFuIiwgcGF0Y2hb ImlkIl1dKQpAQCAtMTkzLDcgKzE5Myw3IEBAIGNsYXNzIEJ1aWxkUXVldWUoQWJzdHJhY3RUcnlR dWV1ZSk6CiAgICAgICAgICAgICBzZWxmLnJ1bl9idWd6aWxsYV90b29sKFsiYnVpbGQiLCBzZWxm LnBvcnQuZmxhZygpLCAiLS1mb3JjZS1jbGVhbiIsICItLXF1aWV0Il0pCiAgICAgICAgIGV4Y2Vw dCBTY3JpcHRFcnJvciwgZToKICAgICAgICAgICAgIHJldHVybiAoRmFsc2UsICJVbmFibGUgdG8g cGVyZm9ybSBhIGJ1aWxkLiIsIE5vbmUpCi0gICAgICAgIHJldHVybiAoVHJ1ZSwgIkJ1aWxkaW5n IHBhdGNoICVzIG9uIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBw YXRjaFsiYnVnX2lkIl0pCisgICAgICAgIHJldHVybiAoVHJ1ZSwgIkJ1aWxkaW5nIHBhdGNoICVz IG9uIGJ1ZyAlcy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaCkKIAog ICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBwYXRjaCk6CiAgICAgICAgIHNlbGYucnVu X2J1Z3ppbGxhX3Rvb2woWyJidWlsZC1hdHRhY2htZW50Iiwgc2VsZi5wb3J0LmZsYWcoKSwgIi0t Zm9yY2UtY2xlYW4iLCAiLS1xdWlldCIsICItLW5vLXVwZGF0ZSIsIHBhdGNoWyJpZCJdXSkKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zdGF0dXNib3QucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvc3RhdHVzYm90LnB5CmluZGV4IGQ5YjU0YjMuLjA0ODUy N2EgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zdGF0dXNib3QucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2JvdC5weQpAQCAtNDYsMjQg KzQ2LDM5IEBAIGh0dHA6Ly93d3dzZWFyY2guc291cmNlZm9yZ2UubmV0L21lY2hhbml6ZS8KICIi IgogICAgIGV4aXQoMSkKIAoraW1wb3J0IHVybGxpYjIKKworCiBjbGFzcyBTdGF0dXNCb3Q6CiAg ICAgZGVmYXVsdF9ob3N0ID0gIndlYmtpdC1jb21taXQtcXVldWUuYXBwc3BvdC5jb20iCiAKICAg ICBkZWYgX19pbml0X18oc2VsZiwgaG9zdD1kZWZhdWx0X2hvc3QpOgogICAgICAgICBzZWxmLnN0 YXR1c2JvdF9ob3N0ID0gaG9zdAogICAgICAgICBzZWxmLnN0YXR1c2JvdF9zZXJ2ZXJfdXJsID0g Imh0dHA6Ly8lcyIgJSBzZWxmLnN0YXR1c2JvdF9ob3N0Ci0gICAgICAgIHNlbGYudXBkYXRlX3N0 YXR1c191cmwgPSAiJXMvdXBkYXRlX3N0YXR1cyIgJSBzZWxmLnN0YXR1c2JvdF9zZXJ2ZXJfdXJs CiAgICAgICAgIHNlbGYuYnJvd3NlciA9IEJyb3dzZXIoKQogCi0gICAgZGVmIHVwZGF0ZV9zdGF0 dXMoc2VsZiwgc3RhdHVzLCBidWdfaWQ9Tm9uZSwgcGF0Y2hfaWQ9Tm9uZSk6CisgICAgZGVmIHVw ZGF0ZV9zdGF0dXMoc2VsZiwgcXVldWVfbmFtZSwgc3RhdHVzLCBwYXRjaCk6CiAgICAgICAgICMg RHVyaW5nIHVuaXQgdGVzdGluZywgc3RhdHVzYm90X2hvc3QgaXMgTm9uZQogICAgICAgICBpZiBu b3Qgc2VsZi5zdGF0dXNib3RfaG9zdDoKICAgICAgICAgICAgIHJldHVybgotICAgICAgICBzZWxm LmJyb3dzZXIub3BlbihzZWxmLnVwZGF0ZV9zdGF0dXNfdXJsKQorCisgICAgICAgIHVwZGF0ZV9z dGF0dXNfdXJsID0gIiVzL3VwZGF0ZS1zdGF0dXMiICUgc2VsZi5zdGF0dXNib3Rfc2VydmVyX3Vy bAorICAgICAgICBzZWxmLmJyb3dzZXIub3Blbih1cGRhdGVfc3RhdHVzX3VybCkKICAgICAgICAg c2VsZi5icm93c2VyLnNlbGVjdF9mb3JtKG5hbWU9InVwZGF0ZV9zdGF0dXMiKQotICAgICAgICBp ZiBidWdfaWQ6Ci0gICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ2J1Z19pZCddID0gc3RyKGJ1Z19p ZCkKLSAgICAgICAgaWYgcGF0Y2hfaWQ6Ci0gICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ3BhdGNo X2lkJ10gPSBzdHIocGF0Y2hfaWQpCisgICAgICAgIHNlbGYuYnJvd3NlclsncXVldWVfbmFtZSdd ID0gcXVldWVfbmFtZQorICAgICAgICBpZiBwYXRjaDoKKyAgICAgICAgICAgIGlmIHBhdGNoLmdl dCgnYnVnX2lkJyk6CisgICAgICAgICAgICAgICAgc2VsZi5icm93c2VyWydidWdfaWQnXSA9IHN0 cihwYXRjaFsnYnVnX2lkJ10pCisgICAgICAgICAgICBpZiBwYXRjaC5nZXQoJ2lkJyk6CisgICAg ICAgICAgICAgICAgc2VsZi5icm93c2VyWydwYXRjaF9pZCddID0gc3RyKHBhdGNoWydpZCddKQog ICAgICAgICBzZWxmLmJyb3dzZXJbJ3N0YXR1cyddID0gc3RhdHVzCiAgICAgICAgIHNlbGYuYnJv d3Nlci5zdWJtaXQoKQorCisgICAgZGVmIHBhdGNoX3N0YXR1cyhzZWxmLCBxdWV1ZV9uYW1lLCBw YXRjaF9pZCk6CisgICAgICAgIHVwZGF0ZV9zdGF0dXNfdXJsID0gIiVzL3BhdGNoLXN0YXR1cy8l cy8lcyIgJSAoc2VsZi5zdGF0dXNib3Rfc2VydmVyX3VybCwgcXVldWVfbmFtZSwgcGF0Y2hfaWQp CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiB1cmxsaWIyLnVybG9wZW4odXBkYXRl X3N0YXR1c191cmwpLnJlYWQoKQorICAgICAgICBleGNlcHQgdXJsbGliMi5IVFRQRXJyb3IsIGU6 CisgICAgICAgICAgICBpZiBlLmNvZGUgPT0gNDA0OgorICAgICAgICAgICAgICAgIHJldHVybiBO b25lCisgICAgICAgICAgICByYWlzZSBlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvd29ya3F1ZXVlLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtx dWV1ZS5weQppbmRleCA4ZTcxNDgxLi45OTdjOGI3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9k dWxlcy93b3JrcXVldWUucHkKQEAgLTM4LDYgKzM4LDkgQEAgZnJvbSBtb2R1bGVzLnNjbSBpbXBv cnQgU2NyaXB0RXJyb3IKIGZyb20gbW9kdWxlcy5zdGF0dXNib3QgaW1wb3J0IFN0YXR1c0JvdAog CiBjbGFzcyBXb3JrUXVldWVEZWxlZ2F0ZToKKyAgICBkZWYgcXVldWVfbmFtZShzZWxmKToKKyAg ICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1l bnQiCisKICAgICBkZWYgcXVldWVfbG9nX3BhdGgoc2VsZik6CiAgICAgICAgIHJhaXNlIE5vdElt cGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3QgaW1wbGVtZW50IgogCkBAIC01Nyw3ICs2 MCw3IEBAIGNsYXNzIFdvcmtRdWV1ZURlbGVnYXRlOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1l bnRlZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIKIAogICAgIGRlZiBzaG91bGRf cHJvY2VlZF93aXRoX3dvcmtfaXRlbShzZWxmLCB3b3JrX2l0ZW0pOgotICAgICAgICAjIHJldHVy bnMgKHNhZmVfdG9fcHJvY2VlZCwgd2FpdGluZ19tZXNzYWdlLCBidWdfaWQpCisgICAgICAgICMg cmV0dXJucyAoc2FmZV90b19wcm9jZWVkLCB3YWl0aW5nX21lc3NhZ2UsIHBhdGNoKQogICAgICAg ICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIK IAogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCB3b3JrX2l0ZW0pOgpAQCAtNjgsNyAr NzEsOCBAQCBjbGFzcyBXb3JrUXVldWVEZWxlZ2F0ZToKIAogCiBjbGFzcyBXb3JrUXVldWU6Ci0g ICAgZGVmIF9faW5pdF9fKHNlbGYsIGRlbGVnYXRlKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwg bmFtZSwgZGVsZWdhdGUpOgorICAgICAgICBzZWxmLl9uYW1lID0gbmFtZQogICAgICAgICBzZWxm Ll9kZWxlZ2F0ZSA9IGRlbGVnYXRlCiAgICAgICAgIHNlbGYuX291dHB1dF90ZWUgPSBPdXRwdXRU ZWUoKQogCkBAIC05NSwxMSArOTksMTEgQEAgY2xhc3MgV29ya1F1ZXVlOgogICAgICAgICAgICAg ICAgIGlmIG5vdCB3b3JrX2l0ZW06CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3VwZGF0ZV9z dGF0dXNfYW5kX3NsZWVwKCJFbXB0eSBxdWV1ZS4iKQogICAgICAgICAgICAgICAgICAgICBjb250 aW51ZQotICAgICAgICAgICAgICAgIChzYWZlX3RvX3Byb2NlZWQsIHdhaXRpbmdfbWVzc2FnZSwg YnVnX2lkKSA9IHNlbGYuX2RlbGVnYXRlLnNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHdv cmtfaXRlbSkKKyAgICAgICAgICAgICAgICAoc2FmZV90b19wcm9jZWVkLCB3YWl0aW5nX21lc3Nh Z2UsIHBhdGNoKSA9IHNlbGYuX2RlbGVnYXRlLnNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVt KHdvcmtfaXRlbSkKICAgICAgICAgICAgICAgICBpZiBub3Qgc2FmZV90b19wcm9jZWVkOgogICAg ICAgICAgICAgICAgICAgICBzZWxmLl91cGRhdGVfc3RhdHVzX2FuZF9zbGVlcCh3YWl0aW5nX21l c3NhZ2UpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICAgICAgc2Vs Zi5zdGF0dXNfYm90LnVwZGF0ZV9zdGF0dXMod2FpdGluZ19tZXNzYWdlLCBidWdfaWQ9YnVnX2lk KQorICAgICAgICAgICAgICAgIHNlbGYuc3RhdHVzX2JvdC51cGRhdGVfc3RhdHVzKHNlbGYuX25h bWUsIHdhaXRpbmdfbWVzc2FnZSwgcGF0Y2gpCiAgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9u LCBlOgogICAgICAgICAgICAgICAgICMgRG9uJ3QgdHJ5IHRlbGwgdGhlIHN0YXR1cyBib3QsIGlu IGNhc2UgdGVsbGluZyBpdCBjYXVzZXMgYW4gZXhjZXB0aW9uLgogICAgICAgICAgICAgICAgIHNl bGYuX3NsZWVwKCJFeGNlcHRpb24gd2hpbGUgcHJlcGFyaW5nIHF1ZXVlOiAlcy4iICUgZSkK