45786 2010-09-14 15:42:53 -0700 Make it possible to run more than one commit-queue instance 2010-09-15 15:43:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 44292 1 eric eric abarth oldest_to_newest 279214 0 eric 2010-09-14 15:42:53 -0700 Make it possible to run more than one commit-queue instance 279224 1 67615 eric 2010-09-14 15:56:40 -0700 Created attachment 67615 Patch 279230 2 eric 2010-09-14 16:03:54 -0700 See http://queues.webkit.org/next-patch/commit-queue. Compare that with the list of patches in queue at http://queues.webkit.org/queue-status/commit-queue. Notice how it is returning the first patch which has not been touched in the last hour. :) 279245 3 67615 abarth 2010-09-14 16:21:11 -0700 Comment on attachment 67615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67615&action=prettypatch > WebKitTools/QueueStatusServer/handlers/nextpatch.py:52 > + def get(self, queue_name): > + self.response.out.write(self._get_next_patch_id(queue_name)) We should use 404 if there's no next patch. REST and all that. > WebKitTools/Scripts/webkitpy/tool/commands/queues.py:156 > + def _fetch_next_work_item(self): > + self.tool.status_server.next_work_item(self.name) No return? > WebKitTools/Scripts/webkitpy/tool/commands/queues.py:219 > + log("Error: status server returned patch id %s which is not one I sent to it.") > + return None Why is this an error? It could have been put there by another instance of this queue. 279780 4 eric 2010-09-15 15:43:46 -0700 Committed r67572: <http://trac.webkit.org/changeset/67572> 67615 2010-09-14 15:56:40 -0700 2010-09-14 16:21:11 -0700 Patch bug-45786-20100914155639.patch text/plain 9140 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlOTUxN2ZkZDhlMTcxN2I1MzU4NWJhMjA2NGM3MTExNDk5NTA5OTdhLi41NzI5Y2Qx N2UxZTBjMGQwY2NlZDZhNzE3Mjc2M2EwNjIyNDVmNDU0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAK KzIwMTAtMDktMTQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8g cnVuIG1vcmUgdGhhbiBvbmUgY29tbWl0LXF1ZXVlIGluc3RhbmNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTc4NgorCisgICAgICAgIE1vc3RseSB3 ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUgdHdvIChvciBtb3JlKSBpbnN0YW5jZXMgZ2V0CisgICAg ICAgIGRpZmZlcmVudCBwYXRjaGVzIHRvIHdvcmsgb24uICBUbyBkbyB0aGlzLCBJIHJlLXdvcmtl ZAorICAgICAgICB0aGUgY29kZSByZXNwb25zaWJsZSBmb3IgZ2V0dGluZyB0aGUgbmV4dCB3b3Jr IGl0ZW0gdG8KKyAgICAgICAgcm91bmQgdHJpcCB0aHJvdWdoIHRoZSBzdGF0dXMgc2VydmVyLiAg VGhlIHN0YXR1cyBzZXJ2ZXIgb25seQorICAgICAgICB2ZW5kcyBwYXRjaGVzIGZyb20gdGhlIHdv cmsgaXRlbXMgbGlzdCwgb25seSBpZiB0aG9zZSBwYXRjaGVzCisgICAgICAgIGhhdmUgbm90IGhh ZCBzdGF0dXMgcmVwb3J0ZWQgZm9yIHRoZW0gaW4gdGhlIGxhc3QgaG91ci4KKworICAgICAgICBU aGlzIGlzIGFub3RoZXIgc3RlcCB0b3dhcmRzIG1ha2luZyBhbGwgcXVldWVzIGdvIHRocm91Z2gg dGhlCisgICAgICAgIHN0YXR1cyBzZXJ2ZXIsIHRodXMgbWFraW5nIGl0IHBvc3NpYmxlIHRvIHJ1 biBtb3JlIHRoYW4gb25lCisgICAgICAgIGluc3RhbmNlIG9mIHZhcmlvdXMgRVdTIGJvdHMgKGFz IHJlcXVlc3RlZCBpbiBidWcgNDQyOTIpLgorCisgICAgICAgIFRoZSB3ZWJraXRweSBjaGFuZ2Vz IGFyZSBhbHJlYWR5IGNvdmVyZWQgYnkgZXhpc3RpbmcgdW5pdCB0ZXN0cy4KKyAgICAgICAgVGhl IFF1ZXVlU3RhdHVzU2V2ZXIgc2FkbHkgaGFzIG5vIHRlc3RpbmcgaW5mcmFzdHJ1Y3R1cmUgeWV0 LiA6KAorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvbmV4dHBhdGNoLnB5 OiBBZGRlZC4KKyAgICAgICAgKiBRdWV1ZVN0YXR1c1NlcnZlci9pbmRleC55YW1sOgorICAgICAg ICAqIFF1ZXVlU3RhdHVzU2VydmVyL21haW4ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weToKKwogMjAxMC0wOS0xNCAgVG9ueSBDaGFuZyAgPHRv bnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL25leHRw YXRjaC5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL25leHRwYXRj aC5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5kYzhmNDhmZDY5ZDczMjFhNmFkYzE0ZWI4ODNlMWFjOTU5YThkZjc5 Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxl cnMvbmV4dHBhdGNoLnB5CkBAIC0wLDAgKzEsNTIgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDEwIEdv b2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHly aWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhlIG5h bWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1h eSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMg dGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4K KyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMg QU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBX QVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNV TEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklH SFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQg T0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9O IEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0Up IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitmcm9t IGdvb2dsZS5hcHBlbmdpbmUuZXh0IGltcG9ydCB3ZWJhcHAKKworZnJvbSBtb2RlbC53b3JraXRl bXMgaW1wb3J0IFdvcmtJdGVtcworZnJvbSBtb2RlbCBpbXBvcnQgcXVldWVzdGF0dXMKKworZnJv bSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUsIHRpbWVkZWx0YQorCisKK2NsYXNzIE5leHRQYXRj aCh3ZWJhcHAuUmVxdWVzdEhhbmRsZXIpOgorICAgIGRlZiBfZ2V0X25leHRfcGF0Y2hfaWQoc2Vs ZiwgcXVldWVfbmFtZSk6CisgICAgICAgIHdvcmtfaXRlbXMgPSBXb3JrSXRlbXMuYWxsKCkuZmls dGVyKCJxdWV1ZV9uYW1lID0iLCBxdWV1ZV9uYW1lKS5nZXQoKQorICAgICAgICBpZiBub3Qgd29y a19pdGVtczoKKyAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIG9uZV9ob3VyX2FnbyA9 IGRhdGV0aW1lLm5vdygpIC0gdGltZWRlbHRhKG1pbnV0ZXM9NjApCisgICAgICAgIHN0YXR1c2Vz ID0gcXVldWVzdGF0dXMuUXVldWVTdGF0dXMuYWxsKCkuZmlsdGVyKCJxdWV1ZV9uYW1lID0iLCBx dWV1ZV9uYW1lKS5maWx0ZXIoImRhdGUgPiIsIG9uZV9ob3VyX2FnbykuZmV0Y2goMTUpCisgICAg ICAgIGFjdGl2ZV9wYXRjaF9pZHMgPSBzZXQoW3N0YXR1cy5hY3RpdmVfcGF0Y2hfaWQgZm9yIHN0 YXR1cyBpbiBzdGF0dXNlc10pCisgICAgICAgIGZvciBpdGVtX2lkIGluIHdvcmtfaXRlbXMuaXRl bV9pZHM6CisgICAgICAgICAgICBpZiBpdGVtX2lkIG5vdCBpbiBhY3RpdmVfcGF0Y2hfaWRzOgor ICAgICAgICAgICAgICAgIHJldHVybiBpdGVtX2lkCisgICAgICAgICMgRWl0aGVyIHRoZXJlIHdl cmUgbm8gd29yayBpdGVtcywgb3IgdGhleSdyZSBhbGwgYWN0aXZlLgorICAgICAgICByZXR1cm4g Tm9uZQorCisgICAgZGVmIGdldChzZWxmLCBxdWV1ZV9uYW1lKToKKyAgICAgICAgc2VsZi5yZXNw b25zZS5vdXQud3JpdGUoc2VsZi5fZ2V0X25leHRfcGF0Y2hfaWQocXVldWVfbmFtZSkpCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9pbmRleC55YW1sIGIvV2ViS2l0 VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaW5kZXgueWFtbAppbmRleCA5NGI2NjkyZTI0Y2QwNDc5 ZDMwOWFhZGYzOGNhZWYzNGY2MTllMjNhLi42YzlhM2IyOWUzZTYyZTY0MjMzNzRkZGZlYWEyMWIx OGQ2ZmZhMDA5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9pbmRl eC55YW1sCisrKyBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2luZGV4LnlhbWwKQEAg LTI3LDYgKzI3LDExIEBAIGluZGV4ZXM6CiAgIHByb3BlcnRpZXM6CiAgIC0gbmFtZTogcXVldWVf bmFtZQogICAtIG5hbWU6IGRhdGUKKworLSBraW5kOiBRdWV1ZVN0YXR1cworICBwcm9wZXJ0aWVz OgorICAtIG5hbWU6IHF1ZXVlX25hbWUKKyAgLSBuYW1lOiBkYXRlCiAgICAgZGlyZWN0aW9uOiBk ZXNjCiAKIC0ga2luZDogU1ZOUmV2aXNpb24KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVl U3RhdHVzU2VydmVyL21haW4ucHkgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tYWlu LnB5CmluZGV4IGU1NTBkYzVmNDU1MzA5N2IyZjAxNTUxMmNjZmNhMWJhNGJkMWE2MjAuLjkzMjI3 Y2E4MDE0MTJjZWI2Y2M1NWMzOWI5ZjRiOTYzZGNlMmRlZTkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL21haW4ucHkKKysrIGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0 dXNTZXJ2ZXIvbWFpbi5weQpAQCAtMzUsNiArMzUsNyBAQCBmcm9tIGdvb2dsZS5hcHBlbmdpbmUu ZXh0LndlYmFwcC51dGlsIGltcG9ydCBydW5fd3NnaV9hcHAKIAogZnJvbSBoYW5kbGVycy5kYXNo Ym9hcmQgaW1wb3J0IERhc2hib2FyZAogZnJvbSBoYW5kbGVycy5nYyBpbXBvcnQgR0MKK2Zyb20g aGFuZGxlcnMubmV4dHBhdGNoIGltcG9ydCBOZXh0UGF0Y2gKIGZyb20gaGFuZGxlcnMucGF0Y2gg aW1wb3J0IFBhdGNoCiBmcm9tIGhhbmRsZXJzLnBhdGNoc3RhdHVzIGltcG9ydCBQYXRjaFN0YXR1 cwogZnJvbSBoYW5kbGVycy5xdWV1ZXN0YXR1cyBpbXBvcnQgUXVldWVTdGF0dXMKQEAgLTU5LDYg KzYwLDcgQEAgcm91dGVzID0gWwogICAgIChyJy9zdGF0dXMtYnViYmxlLyguKiknLCBTdGF0dXNC dWJibGUpLAogICAgIChyJy9zdm4tcmV2aXNpb24vKC4qKScsIFNWTlJldmlzaW9uKSwKICAgICAo cicvcXVldWUtc3RhdHVzLyguKiknLCBRdWV1ZVN0YXR1cyksCisgICAgKHInL25leHQtcGF0Y2gv KC4qKScsIE5leHRQYXRjaCksCiAgICAgKCcvdXBkYXRlLXN0YXR1cycsIFVwZGF0ZVN0YXR1cyks CiAgICAgKCcvdXBkYXRlLXdvcmstaXRlbXMnLCBVcGRhdGVXb3JrSXRlbXMpLAogICAgICgnL3Vw ZGF0ZS1zdm4tcmV2aXNpb24nLCBVcGRhdGVTVk5SZXZpc2lvbiksCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weQppbmRleCAzMWFj NWQ4YWQ4MmVjMTc1ZmZjMmU2MzVmNTQwMDU1NmVjOTY0YTk3Li41NGZhN2IxZDM3NDAxYzFiNzRj MWIzMGY3ZmI5ZjIwM2NhZTRiNDhiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkKQEAgLTE0NCw4ICsxNDQsMTYgQEAgY2xh c3MgQWJzdHJhY3RQYXRjaFF1ZXVlKEFic3RyYWN0UXVldWUpOgogICAgIGRlZiBfdXBkYXRlX3N0 YXR1cyhzZWxmLCBtZXNzYWdlLCBwYXRjaD1Ob25lLCByZXN1bHRzX2ZpbGU9Tm9uZSk6CiAgICAg ICAgIHNlbGYudG9vbC5zdGF0dXNfc2VydmVyLnVwZGF0ZV9zdGF0dXMoc2VsZi5uYW1lLCBtZXNz YWdlLCBwYXRjaCwgcmVzdWx0c19maWxlKQogCisgICAgIyBOb3RlLCBldmVudHVhbGx5IHRoaXMg d2lsbCBiZSBkb25lIGJ5IGEgc2VwYXJhdGUgImZlZWRlciIgcXVldWUKKyAgICAjIHdob3NlIGpv YiBpdCBpcyB0byBwb2xsIGJ1Z3ppbGxhIGFuZCBmZWVkIHdvcmsgaXRlbXMgaW50byB0aGUKKyAg ICAjIHN0YXR1cyBzZXJ2ZXIgZm9yIG90aGVyIHF1ZXVlcyB0byBtdW5jaCBvbi4KICAgICBkZWYg X3VwZGF0ZV93b3JrX2l0ZW1zKHNlbGYsIHBhdGNoX2lkcyk6CiAgICAgICAgIHNlbGYudG9vbC5z dGF0dXNfc2VydmVyLnVwZGF0ZV93b3JrX2l0ZW1zKHNlbGYubmFtZSwgcGF0Y2hfaWRzKQorICAg ICAgICBpZiBwYXRjaF9pZHM6CisgICAgICAgICAgICBzZWxmLmxvZ19wcm9ncmVzcyhwYXRjaF9p ZHMpCisKKyAgICBkZWYgX2ZldGNoX25leHRfd29ya19pdGVtKHNlbGYpOgorICAgICAgICBzZWxm LnRvb2wuc3RhdHVzX3NlcnZlci5uZXh0X3dvcmtfaXRlbShzZWxmLm5hbWUpCiAKICAgICBkZWYg X2RpZF9wYXNzKHNlbGYsIHBhdGNoKToKICAgICAgICAgc2VsZi5fdXBkYXRlX3N0YXR1cyhzZWxm Ll9wYXNzX3N0YXR1cywgcGF0Y2gpCkBAIC0xOTAsMTQgKzE5OCwyNSBAQCBjbGFzcyBDb21taXRR dWV1ZShBYnN0cmFjdFBhdGNoUXVldWUsIFN0ZXBTZXF1ZW5jZUVycm9ySGFuZGxlcik6CiAgICAg ICAgIHJldHVybiBjbXAoYS5hdHRhY2hfZGF0ZSgpLCBiLmF0dGFjaF9kYXRlKCkpCiAKICAgICBk ZWYgbmV4dF93b3JrX2l0ZW0oc2VsZik6CisgICAgICAgICMgR3JhYiB0aGUgc2V0IG9mIHBhdGNo ZXMgZnJvbSBidWd6aWxsYSwgc29ydCB0aGVtLCBhbmQgdXBkYXRlIHRoZSBzdGF0dXMgc2VydmVy LgorICAgICAgICAjIEV2ZW50dWFsbHkgdGhpcyB3aWxsIGFsbCBiZSBkb25lIGJ5IGEgc2VwYXJh dGUgZmVlZGVyIHF1ZXVlLgogICAgICAgICBwYXRjaGVzID0gc2VsZi5fdmFsaWRhdGVfcGF0Y2hl c19pbl9jb21taXRfcXVldWUoKQogICAgICAgICBwYXRjaGVzID0gc29ydGVkKHBhdGNoZXMsIHNl bGYuX3BhdGNoX2NtcCkKICAgICAgICAgc2VsZi5fdXBkYXRlX3dvcmtfaXRlbXMoW3BhdGNoLmlk KCkgZm9yIHBhdGNoIGluIHBhdGNoZXNdKQogICAgICAgICBpZiBub3QgcGF0Y2hlczoKICAgICAg ICAgICAgIHJldHVybiBOb25lCi0gICAgICAgICMgT25seSBib3RoZXIgbG9nZ2luZyBpZiB3ZSBo YXZlIHBhdGNoZXMgaW4gdGhlIHF1ZXVlLgotICAgICAgICBzZWxmLmxvZ19wcm9ncmVzcyhbcGF0 Y2guaWQoKSBmb3IgcGF0Y2ggaW4gcGF0Y2hlc10pCi0gICAgICAgIHJldHVybiBwYXRjaGVzWzBd CisKKyAgICAgICAgIyBUaGUgZ3JhYiB0aGUgbmV4dCBwYXRjaCB0byB3b3JrIG9uIGJhY2sgZnJv bSB0aGUgc3RhdHVzIHNlcnZlci4KKyAgICAgICAgcGF0Y2hfaWQgPSBzZWxmLl9mZXRjaF9uZXh0 X3dvcmtfaXRlbSgpCisgICAgICAgIGlmIG5vdCBwYXRjaF9pZDoKKyAgICAgICAgICAgIHJldHVy biBOb25lCisgICAgICAgICMgV2UgY291bGQganVzdCBjYWxsOiByZXR1cm4gc2VsZi50b29sLmJ1 Z3MuZmV0Y2hfYXR0YWNobWVudChwYXRjaF9pZCkKKyAgICAgICAgIyBidXQgdGhhdCB3b3VsZCBj YXVzZSAyIG5lZWRsZXNzIGJ1Z3ppbGxhIGhpdHMuCisgICAgICAgIGZvciBwYXRjaCBpbiBwYXRj aGVzOgorICAgICAgICAgICAgaWYgcGF0Y2guaWQoKSA9PSBwYXRjaF9pZDoKKyAgICAgICAgICAg ICAgICByZXR1cm4gcGF0Y2gKKyAgICAgICAgbG9nKCJFcnJvcjogc3RhdHVzIHNlcnZlciByZXR1 cm5lZCBwYXRjaCBpZCAlcyB3aGljaCBpcyBub3Qgb25lIEkgc2VudCB0byBpdC4iKQorICAgICAg ICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9jYW5fYnVpbGRfYW5kX3Rlc3Qoc2VsZik6CiAgICAg ICAgIHRyeToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9t b2NrdG9vbC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5w eQppbmRleCBlM2QzNmNlYzg4MDBjNjEwZDMzZjA2NTdkMDc2YTVmYjEzYWNmZTVhLi4zYWI2MjU5 NTI0YWNlOWFjYWQyOTY0NGEyNzJkMDFiZTk3M2VjNDAwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CkBAIC00OTksNiArNDk5LDcgQEAgY2xhc3Mg TW9ja1N0YXR1c1NlcnZlcihvYmplY3QpOgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAg ICAgICBzZWxmLmhvc3QgPSAiZXhhbXBsZS5jb20iCisgICAgICAgIHNlbGYuX3dvcmtfaXRlbXMg PSBbXQogCiAgICAgZGVmIHBhdGNoX3N0YXR1cyhzZWxmLCBxdWV1ZV9uYW1lLCBwYXRjaF9pZCk6 CiAgICAgICAgIHJldHVybiBOb25lCkBAIC01MDYsNyArNTA3LDExIEBAIGNsYXNzIE1vY2tTdGF0 dXNTZXJ2ZXIob2JqZWN0KToKICAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHN2bl9yZXZpc2lv bik6CiAgICAgICAgIHJldHVybiBOb25lCiAKKyAgICBkZWYgbmV4dF93b3JrX2l0ZW0oc2VsZiwg cXVldWVfbmFtZSk6CisgICAgICAgIHJldHVybiBzZWxmLl93b3JrX2l0ZW1zWzBdCisKICAgICBk ZWYgdXBkYXRlX3dvcmtfaXRlbXMoc2VsZiwgcXVldWVfbmFtZSwgd29ya19pdGVtcyk6CisgICAg ICAgIHNlbGYuX3dvcmtfaXRlbXMgPSB3b3JrX2l0ZW1zCiAgICAgICAgIGxvZygiTU9DSzogdXBk YXRlX3dvcmtfaXRlbXM6ICVzICVzIiAlIChxdWV1ZV9uYW1lLCB3b3JrX2l0ZW1zKSkKIAogICAg IGRlZiB1cGRhdGVfc3RhdHVzKHNlbGYsIHF1ZXVlX25hbWUsIHN0YXR1cywgcGF0Y2g9Tm9uZSwg cmVzdWx0c19maWxlPU5vbmUpOgo=