137290 2014-10-01 00:05:57 -0700 EWS is too eager to say that a patch does not apply to trunk of repository 2014-10-01 10:24:16 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap dbates rniwa oldest_to_newest 1038492 0 ap 2014-10-01 00:05:57 -0700 The patch in bug 137272 was processed by some queues, yet EWS claims that it was not. 1038493 1 239012 ap 2014-10-01 00:08:28 -0700 Created attachment 239012 proposed fix 1038531 2 239012 rniwa 2014-10-01 06:40:52 -0700 Comment on attachment 239012 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=239012&action=review > Tools/QueueStatusServer/handlers/statusbubble.py:165 > + bubble["had_resultative_status_other_than_failure_to_apply"] = any(map(lambda status: status.message not in progress_statuses and status.message != "Patch does not apply" and status.message != "Error: " + queue.name() + " unable to apply patch.", statuses)) Can we split this into two lines? It's awfully long. Alternatively, I would the variable name to did_not_fail_to_apply. > Tools/QueueStatusServer/handlers/statusbubble.py:191 > + had_resultative_status_other_than_failure_to_apply = any(map(lambda bubble: bubble["had_resultative_status_other_than_failure_to_apply"] == True, bubbles)) No need to compare with True (i.e. remove == True). 1038561 3 239029 ap 2014-10-01 09:07:10 -0700 Created attachment 239029 better fix I realized that the truth lies in between - with the previous patch, we could get all red and all popups would just say "failed to apply", which is useless. 1038576 4 239029 rniwa 2014-10-01 09:58:08 -0700 Comment on attachment 239029 better fix View in context: https://bugs.webkit.org/attachment.cgi?id=239029&action=review > Tools/QueueStatusServer/handlers/statusbubble.py:129 > + bubble["had_resultative_status_other_than_failure_to_apply"] = any(map(lambda status: latest_resultative_status and latest_resultative_status.message != "Error: " + queue.name() + " unable to apply patch.", statuses)) Again, can we split this into two lines? It's really long. 1038578 5 239029 dbates 2014-10-01 10:08:21 -0700 Comment on attachment 239029 better fix View in context: https://bugs.webkit.org/attachment.cgi?id=239029&action=review > Tools/QueueStatusServer/app.yaml:2 > +version: ap # Bugzilla bug ID of last major change I take it you are using ap as placeholder. Regardless, the inline comment doesn't make sense at least since <http://trac.webkit.org/changeset/162288>. We seem to be using the SVN revision number instead of the Bugzilla bug id for the version since <http://trac.webkit.org/changeset/161062>. This is error prone and has led to a mismatch between the actual SVN revision and the revision recorded in this file at least once so far in <http://trac.webkit.org/changeset/162288>. I assume that the actual value of version matters less than changing it to be something different from the last recorded version, possibly with the invariant that its value is monotonically increasing. Regardless, we should standardize a convention for updating it and update the comment in this file to document the convention. 1038579 6 dbates 2014-10-01 10:09:47 -0700 (In reply to comment #5) > (From update of attachment 239029 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239029&action=review > > > Tools/QueueStatusServer/app.yaml:2 > > +version: ap # Bugzilla bug ID of last major change > >... Regardless, the inline comment doesn't make sense at least since <http://trac.webkit.org/changeset/162288>.... *the inline comment doesn't make sense. 1038581 7 ap 2014-10-01 10:18:29 -0700 Committed <http://trac.webkit.org/r174158>. 1038583 8 ap 2014-10-01 10:24:16 -0700 > the inline comment doesn't make sense I guess I never read the comment! I think that we always used svn revision here, Ryosuke guided me to do so when I first made a change to the webkit-queues app. Yes, I think that an svn revision is more useful than a bug ID, as we can bisect when something breaks (AppEngine keeps old versions available until one manually deletes them). 239012 2014-10-01 00:08:28 -0700 2014-10-01 06:40:52 -0700 proposed fix CantApply2.txt text/plain 4425 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NDE0NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE0LTEwLTAxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEVXUyBpcyB0b28gZWFnZXIgdG8gc2F5IHRoYXQgYSBwYXRjaCBkb2VzIG5v dCBhcHBseSB0byB0cnVuayBvZiByZXBvc2l0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzcyOTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL2FwcC55YW1sOiBVcGRh dGVkIGFwcCB2ZXJzaW9uLgorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMv c3RhdHVzYnViYmxlLnB5OgorICAgICAgICAoU3RhdHVzQnViYmxlLl9idWlsZF9idWJibGUpOgor ICAgICAgICAoU3RhdHVzQnViYmxlLl9idWlsZF9idWJibGVzX2Zvcl9hdHRhY2htZW50KToKKyAg ICAgICAgUmV3cm90ZSB0byBtYWtlIG1vcmUgc2Vuc2UuCisKIDIwMTQtMDktMzAgIEV2YSBCYWxh enNmYWx2aSAgPGV2YWIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBS ZW1vdmUgdGhpcmRwYXJ0eS91bml0dGVzdDIgZnJvbSB3ZWJraXRweQpJbmRleDogVG9vbHMvUXVl dWVTdGF0dXNTZXJ2ZXIvYXBwLnlhbWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXVldWVTdGF0dXNT ZXJ2ZXIvYXBwLnlhbWwJKHJldmlzaW9uIDE3NDEyNCkKKysrIFRvb2xzL1F1ZXVlU3RhdHVzU2Vy dmVyL2FwcC55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogYXBwbGljYXRpb246 IHdlYmtpdC1xdWV1ZXMKLXZlcnNpb246IDE3NDEyNCAjIEJ1Z3ppbGxhIGJ1ZyBJRCBvZiBsYXN0 IG1ham9yIGNoYW5nZQordmVyc2lvbjogYXAgIyBCdWd6aWxsYSBidWcgSUQgb2YgbGFzdCBtYWpv ciBjaGFuZ2UKIHJ1bnRpbWU6IHB5dGhvbgogYXBpX3ZlcnNpb246IDEKIApJbmRleDogVG9vbHMv UXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvc3RhdHVzYnViYmxlLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3N0YXR1c2J1YmJsZS5weQkocmV2aXNp b24gMTc0MTE4KQorKysgVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvc3RhdHVzYnVi YmxlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTgsMTMgKzExOCwxMSBAQCBjbGFzcyBTdGF0dXNC dWJibGUod2ViYXBwLlJlcXVlc3RIYW5kbGVyCiAgICAgICAgICAgICBpZiBhdHRhY2htZW50Lmlk IGluIHF1ZXVlLmFjdGl2ZV93b3JrX2l0ZW1zKCkuaXRlbV9pZHM6CiAgICAgICAgICAgICAgICAg YnViYmxlWyJzdGF0ZSJdID0gInN0YXJ0ZWQiCiAgICAgICAgICAgICAgICAgYnViYmxlWyJkZXRh aWxzX21lc3NhZ2UiXSA9ICJTdGFydGVkIHByb2Nlc3NpbmcsIG5vIG91dHB1dCB5ZXQuXG5cbiIg KyBzZWxmLl9pc29fdGltZShxdWV1ZS5hY3RpdmVfd29ya19pdGVtcygpLnRpbWVfZm9yX2l0ZW0o YXR0YWNobWVudC5pZCkpCi0gICAgICAgICAgICAgICAgYnViYmxlWyJtYXlfZmFpbF90b19hcHBs eSJdID0gVHJ1ZQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICByZWFsX3F1ZXVl X3Bvc2l0aW9uID0gc2VsZi5fcmVhbF9xdWV1ZV9wb3NpdGlvbihxdWV1ZSwgcXVldWVfcG9zaXRp b24pCiAgICAgICAgICAgICAgICAgYnViYmxlWyJzdGF0ZSJdID0gIm5vbmUiCiAgICAgICAgICAg ICAgICAgYnViYmxlWyJkZXRhaWxzX21lc3NhZ2UiXSA9ICJXYWl0aW5nIGluIHF1ZXVlLCBwcm9j ZXNzaW5nIGhhcyBub3Qgc3RhcnRlZCB5ZXQuXG5cblBvc2l0aW9uIGluIHF1ZXVlOiAiICsgc3Ry KHJlYWxfcXVldWVfcG9zaXRpb24pCiAgICAgICAgICAgICAgICAgYnViYmxlWyJxdWV1ZV9wb3Np dGlvbiJdID0gcmVhbF9xdWV1ZV9wb3NpdGlvbgotICAgICAgICAgICAgICAgIGJ1YmJsZVsibWF5 X2ZhaWxfdG9fYXBwbHkiXSA9IFRydWUKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGxhdGVz dF9yZXN1bHRhdGl2ZV9zdGF0dXMgPSBzZWxmLl9sYXRlc3RfcmVzdWx0YXRpdmVfc3RhdHVzKHN0 YXR1c2VzKQogICAgICAgICAgICAgaWYgbm90IGxhdGVzdF9yZXN1bHRhdGl2ZV9zdGF0dXM6CkBA IC0xNDYsNyArMTQ0LDYgQEAgY2xhc3MgU3RhdHVzQnViYmxlKHdlYmFwcC5SZXF1ZXN0SGFuZGxl cgogICAgICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgICAgICAgICAgYnVi YmxlWyJkZXRhaWxzX21lc3NhZ2UiXSArPSAiIFNvbWUgbWVzc2FnZXMgd2VyZSBsb2dnZWQgd2hp bGUgdGhlIHBhdGNoIHdhcyBzdGlsbCBlbGlnaWJsZTpcblxuIgogICAgICAgICAgICAgICAgICAg ICBidWJibGVbImRldGFpbHNfbWVzc2FnZSJdICs9ICJcbiIuam9pbihbc3RhdHVzLm1lc3NhZ2Ug Zm9yIHN0YXR1cyBpbiBzdGF0dXNlc1sxOl1dKSArICJcblxuIiArIHNlbGYuX2lzb190aW1lKHN0 YXR1c2VzWzBdLmRhdGUpCi0gICAgICAgICAgICAgICAgYnViYmxlWyJtYXlfZmFpbF90b19hcHBs eSJdID0gVHJ1ZQogICAgICAgICAgICAgZWxpZiBzdGF0dXNlc1swXS5tZXNzYWdlID09ICJFcnJv cjogIiArIHF1ZXVlLm5hbWUoKSArICIgdW5hYmxlIHRvIGFwcGx5IHBhdGNoLiI6CiAgICAgICAg ICAgICAgICAgYnViYmxlWyJzdGF0ZSJdID0gImZhaWwiCiAgICAgICAgICAgICAgICAgYnViYmxl WyJkZXRhaWxzX21lc3NhZ2UiXSA9IHN0YXR1c2VzWzFdLm1lc3NhZ2UgKyAiXG5cbiIgKyBzZWxm Ll9pc29fdGltZShzdGF0dXNlc1swXS5kYXRlKQpAQCAtMTY1LDYgKzE2Miw4IEBAIGNsYXNzIFN0 YXR1c0J1YmJsZSh3ZWJhcHAuUmVxdWVzdEhhbmRsZXIKICAgICAgICAgaWYgImRldGFpbHNfbWVz c2FnZSIgaW4gYnViYmxlOgogICAgICAgICAgICAgYnViYmxlWyJkZXRhaWxzX21lc3NhZ2UiXSA9 IHF1ZXVlLmRpc3BsYXlfbmFtZSgpICsgIlxuXG4iICsgYnViYmxlWyJkZXRhaWxzX21lc3NhZ2Ui XQogCisgICAgICAgIGJ1YmJsZVsiaGFkX3Jlc3VsdGF0aXZlX3N0YXR1c19vdGhlcl90aGFuX2Zh aWx1cmVfdG9fYXBwbHkiXSA9IGFueShtYXAobGFtYmRhIHN0YXR1czogc3RhdHVzLm1lc3NhZ2Ug bm90IGluIHByb2dyZXNzX3N0YXR1c2VzIGFuZCBzdGF0dXMubWVzc2FnZSAhPSAiUGF0Y2ggZG9l cyBub3QgYXBwbHkiIGFuZCBzdGF0dXMubWVzc2FnZSAhPSAiRXJyb3I6ICIgKyBxdWV1ZS5uYW1l KCkgKyAiIHVuYWJsZSB0byBhcHBseSBwYXRjaC4iLCBzdGF0dXNlcykpCisKICAgICAgICAgcmV0 dXJuIGJ1YmJsZQogCiAgICAgZGVmIF9zaG91bGRfc2hvd19idWJibGVfZm9yKHNlbGYsIGF0dGFj aG1lbnQsIHF1ZXVlKToKQEAgLTE4OSw5ICsxODgsOSBAQCBjbGFzcyBTdGF0dXNCdWJibGUod2Vi YXBwLlJlcXVlc3RIYW5kbGVyCiAgICAgICAgICAgICAgICAgc2hvd19zdWJtaXRfdG9fZXdzID0g RmFsc2UKIAogICAgICAgICBmYWlsZWRfdG9fYXBwbHkgPSBhbnkobWFwKGxhbWJkYSBidWJibGU6 ICJmYWlsZWRfdG9fYXBwbHkiIGluIGJ1YmJsZSwgYnViYmxlcykpCi0gICAgICAgIGhhZF9vdXRw dXQgPSBhbGwobWFwKGxhbWJkYSBidWJibGU6IG5vdCAibWF5X2ZhaWxfdG9fYXBwbHkiIGluIGJ1 YmJsZSBhbmQgbm90ICJmYWlsZWRfdG9fYXBwbHkiIGluIGJ1YmJsZSwgYnViYmxlcykpCisgICAg ICAgIGhhZF9yZXN1bHRhdGl2ZV9zdGF0dXNfb3RoZXJfdGhhbl9mYWlsdXJlX3RvX2FwcGx5ID0g YW55KG1hcChsYW1iZGEgYnViYmxlOiBidWJibGVbImhhZF9yZXN1bHRhdGl2ZV9zdGF0dXNfb3Ro ZXJfdGhhbl9mYWlsdXJlX3RvX2FwcGx5Il0gPT0gVHJ1ZSwgYnViYmxlcykpCiAKLSAgICAgICAg cmV0dXJuIChidWJibGVzLCBzaG93X3N1Ym1pdF90b19ld3MsIGZhaWxlZF90b19hcHBseSBhbmQg KG5vdCBoYWRfb3V0cHV0KSBhbmQgKG5vdCBzaG93X3N1Ym1pdF90b19ld3MpKQorICAgICAgICBy ZXR1cm4gKGJ1YmJsZXMsIHNob3dfc3VibWl0X3RvX2V3cywgZmFpbGVkX3RvX2FwcGx5IGFuZCBu b3QgaGFkX3Jlc3VsdGF0aXZlX3N0YXR1c19vdGhlcl90aGFuX2ZhaWx1cmVfdG9fYXBwbHkpCiAK ICAgICBkZWYgZ2V0KHNlbGYsIGF0dGFjaG1lbnRfaWRfc3RyaW5nKToKICAgICAgICAgYXR0YWNo bWVudF9pZCA9IGludChhdHRhY2htZW50X2lkX3N0cmluZykK 239029 2014-10-01 09:07:10 -0700 2014-10-01 10:08:21 -0700 better fix CantApply2.txt text/plain 4589 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NDE0NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE0LTEwLTAxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEVXUyBpcyB0b28gZWFnZXIgdG8gc2F5IHRoYXQgYSBwYXRjaCBkb2VzIG5v dCBhcHBseSB0byB0cnVuayBvZiByZXBvc2l0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzcyOTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL2FwcC55YW1sOiBVcGRh dGVkIGFwcCB2ZXJzaW9uLgorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMv c3RhdHVzYnViYmxlLnB5OgorICAgICAgICAoU3RhdHVzQnViYmxlLl9idWlsZF9idWJibGUpOgor ICAgICAgICAoU3RhdHVzQnViYmxlLl9idWlsZF9idWJibGVzX2Zvcl9hdHRhY2htZW50KToKKyAg ICAgICAgUmV3cm90ZSB0byBtYWtlIG1vcmUgc2Vuc2UuCisKIDIwMTQtMDktMzAgIEV2YSBCYWxh enNmYWx2aSAgPGV2YWIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBS ZW1vdmUgdGhpcmRwYXJ0eS91bml0dGVzdDIgZnJvbSB3ZWJraXRweQpJbmRleDogVG9vbHMvUXVl dWVTdGF0dXNTZXJ2ZXIvYXBwLnlhbWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXVldWVTdGF0dXNT ZXJ2ZXIvYXBwLnlhbWwJKHJldmlzaW9uIDE3NDEyNCkKKysrIFRvb2xzL1F1ZXVlU3RhdHVzU2Vy dmVyL2FwcC55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogYXBwbGljYXRpb246 IHdlYmtpdC1xdWV1ZXMKLXZlcnNpb246IDE3NDEyNCAjIEJ1Z3ppbGxhIGJ1ZyBJRCBvZiBsYXN0 IG1ham9yIGNoYW5nZQordmVyc2lvbjogYXAgIyBCdWd6aWxsYSBidWcgSUQgb2YgbGFzdCBtYWpv ciBjaGFuZ2UKIHJ1bnRpbWU6IHB5dGhvbgogYXBpX3ZlcnNpb246IDEKIApJbmRleDogVG9vbHMv UXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvc3RhdHVzYnViYmxlLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3N0YXR1c2J1YmJsZS5weQkocmV2aXNp b24gMTc0MTE4KQorKysgVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvc3RhdHVzYnVi YmxlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsMTggKzExNSwxOCBAQCBjbGFzcyBTdGF0dXNC dWJibGUod2ViYXBwLlJlcXVlc3RIYW5kbGVyCiAgICAgICAgICMgMTAgcmVjZW50IHN0YXR1c2Vz IGlzIGVub3VnaCB0byBhbHdheXMgaW5jbHVkZSBhIHJlc3VsdGF0aXZlIG9uZSwgaWYgdGhlcmUg d2VyZSBhbnkgYXQgYWxsLgogICAgICAgICBzdGF0dXNlcyA9IFF1ZXVlU3RhdHVzLmFsbCgpLmZp bHRlcigncXVldWVfbmFtZSA9JywgcXVldWUubmFtZSgpKS5maWx0ZXIoJ2FjdGl2ZV9wYXRjaF9p ZCA9JywgYXR0YWNobWVudC5pZCkub3JkZXIoJy1kYXRlJykuZmV0Y2gobGltaXQ9MTApCiAgICAg ICAgIGlmIG5vdCBzdGF0dXNlczoKKyAgICAgICAgICAgIGJ1YmJsZVsiaGFkX3Jlc3VsdGF0aXZl X3N0YXR1c19vdGhlcl90aGFuX2ZhaWx1cmVfdG9fYXBwbHkiXSA9IEZhbHNlCiAgICAgICAgICAg ICBpZiBhdHRhY2htZW50LmlkIGluIHF1ZXVlLmFjdGl2ZV93b3JrX2l0ZW1zKCkuaXRlbV9pZHM6 CiAgICAgICAgICAgICAgICAgYnViYmxlWyJzdGF0ZSJdID0gInN0YXJ0ZWQiCiAgICAgICAgICAg ICAgICAgYnViYmxlWyJkZXRhaWxzX21lc3NhZ2UiXSA9ICJTdGFydGVkIHByb2Nlc3NpbmcsIG5v IG91dHB1dCB5ZXQuXG5cbiIgKyBzZWxmLl9pc29fdGltZShxdWV1ZS5hY3RpdmVfd29ya19pdGVt cygpLnRpbWVfZm9yX2l0ZW0oYXR0YWNobWVudC5pZCkpCi0gICAgICAgICAgICAgICAgYnViYmxl WyJtYXlfZmFpbF90b19hcHBseSJdID0gVHJ1ZQogICAgICAgICAgICAgZWxzZToKICAgICAgICAg ICAgICAgICByZWFsX3F1ZXVlX3Bvc2l0aW9uID0gc2VsZi5fcmVhbF9xdWV1ZV9wb3NpdGlvbihx dWV1ZSwgcXVldWVfcG9zaXRpb24pCiAgICAgICAgICAgICAgICAgYnViYmxlWyJzdGF0ZSJdID0g Im5vbmUiCiAgICAgICAgICAgICAgICAgYnViYmxlWyJkZXRhaWxzX21lc3NhZ2UiXSA9ICJXYWl0 aW5nIGluIHF1ZXVlLCBwcm9jZXNzaW5nIGhhcyBub3Qgc3RhcnRlZCB5ZXQuXG5cblBvc2l0aW9u IGluIHF1ZXVlOiAiICsgc3RyKHJlYWxfcXVldWVfcG9zaXRpb24pCiAgICAgICAgICAgICAgICAg YnViYmxlWyJxdWV1ZV9wb3NpdGlvbiJdID0gcmVhbF9xdWV1ZV9wb3NpdGlvbgotICAgICAgICAg ICAgICAgIGJ1YmJsZVsibWF5X2ZhaWxfdG9fYXBwbHkiXSA9IFRydWUKICAgICAgICAgZWxzZToK ICAgICAgICAgICAgIGxhdGVzdF9yZXN1bHRhdGl2ZV9zdGF0dXMgPSBzZWxmLl9sYXRlc3RfcmVz dWx0YXRpdmVfc3RhdHVzKHN0YXR1c2VzKQorICAgICAgICAgICAgYnViYmxlWyJoYWRfcmVzdWx0 YXRpdmVfc3RhdHVzX290aGVyX3RoYW5fZmFpbHVyZV90b19hcHBseSJdID0gYW55KG1hcChsYW1i ZGEgc3RhdHVzOiBsYXRlc3RfcmVzdWx0YXRpdmVfc3RhdHVzIGFuZCBsYXRlc3RfcmVzdWx0YXRp dmVfc3RhdHVzLm1lc3NhZ2UgIT0gIkVycm9yOiAiICsgcXVldWUubmFtZSgpICsgIiB1bmFibGUg dG8gYXBwbHkgcGF0Y2guIiwgc3RhdHVzZXMpKQogICAgICAgICAgICAgaWYgbm90IGxhdGVzdF9y ZXN1bHRhdGl2ZV9zdGF0dXM6CiAgICAgICAgICAgICAgICAgYnViYmxlWyJzdGF0ZSJdID0gInN0 YXJ0ZWQiCiAgICAgICAgICAgICAgICAgYnViYmxlWyJkZXRhaWxzX21lc3NhZ2UiXSA9ICgiU3Rh cnRlZCBwcm9jZXNzaW5nLlxuXG5SZWNlbnQgbWVzc2FnZXM6XG5cbiIKQEAgLTE0Niw3ICsxNDYs NiBAQCBjbGFzcyBTdGF0dXNCdWJibGUod2ViYXBwLlJlcXVlc3RIYW5kbGVyCiAgICAgICAgICAg ICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgICAgICAgICBidWJibGVbImRldGFpbHNf bWVzc2FnZSJdICs9ICIgU29tZSBtZXNzYWdlcyB3ZXJlIGxvZ2dlZCB3aGlsZSB0aGUgcGF0Y2gg d2FzIHN0aWxsIGVsaWdpYmxlOlxuXG4iCiAgICAgICAgICAgICAgICAgICAgIGJ1YmJsZVsiZGV0 YWlsc19tZXNzYWdlIl0gKz0gIlxuIi5qb2luKFtzdGF0dXMubWVzc2FnZSBmb3Igc3RhdHVzIGlu IHN0YXR1c2VzWzE6XV0pICsgIlxuXG4iICsgc2VsZi5faXNvX3RpbWUoc3RhdHVzZXNbMF0uZGF0 ZSkKLSAgICAgICAgICAgICAgICBidWJibGVbIm1heV9mYWlsX3RvX2FwcGx5Il0gPSBUcnVlCiAg ICAgICAgICAgICBlbGlmIHN0YXR1c2VzWzBdLm1lc3NhZ2UgPT0gIkVycm9yOiAiICsgcXVldWUu bmFtZSgpICsgIiB1bmFibGUgdG8gYXBwbHkgcGF0Y2guIjoKICAgICAgICAgICAgICAgICBidWJi bGVbInN0YXRlIl0gPSAiZmFpbCIKICAgICAgICAgICAgICAgICBidWJibGVbImRldGFpbHNfbWVz c2FnZSJdID0gc3RhdHVzZXNbMV0ubWVzc2FnZSArICJcblxuIiArIHNlbGYuX2lzb190aW1lKHN0 YXR1c2VzWzBdLmRhdGUpCkBAIC0xODksOSArMTg4LDkgQEAgY2xhc3MgU3RhdHVzQnViYmxlKHdl YmFwcC5SZXF1ZXN0SGFuZGxlcgogICAgICAgICAgICAgICAgIHNob3dfc3VibWl0X3RvX2V3cyA9 IEZhbHNlCiAKICAgICAgICAgZmFpbGVkX3RvX2FwcGx5ID0gYW55KG1hcChsYW1iZGEgYnViYmxl OiAiZmFpbGVkX3RvX2FwcGx5IiBpbiBidWJibGUsIGJ1YmJsZXMpKQotICAgICAgICBoYWRfb3V0 cHV0ID0gYWxsKG1hcChsYW1iZGEgYnViYmxlOiBub3QgIm1heV9mYWlsX3RvX2FwcGx5IiBpbiBi dWJibGUgYW5kIG5vdCAiZmFpbGVkX3RvX2FwcGx5IiBpbiBidWJibGUsIGJ1YmJsZXMpKQorICAg ICAgICBoYWRfcmVzdWx0YXRpdmVfc3RhdHVzX290aGVyX3RoYW5fZmFpbHVyZV90b19hcHBseSA9 IGFueShtYXAobGFtYmRhIGJ1YmJsZTogYnViYmxlWyJoYWRfcmVzdWx0YXRpdmVfc3RhdHVzX290 aGVyX3RoYW5fZmFpbHVyZV90b19hcHBseSJdLCBidWJibGVzKSkKIAotICAgICAgICByZXR1cm4g KGJ1YmJsZXMsIHNob3dfc3VibWl0X3RvX2V3cywgZmFpbGVkX3RvX2FwcGx5IGFuZCAobm90IGhh ZF9vdXRwdXQpIGFuZCAobm90IHNob3dfc3VibWl0X3RvX2V3cykpCisgICAgICAgIHJldHVybiAo YnViYmxlcywgc2hvd19zdWJtaXRfdG9fZXdzLCBmYWlsZWRfdG9fYXBwbHkgYW5kIG5vdCBoYWRf cmVzdWx0YXRpdmVfc3RhdHVzX290aGVyX3RoYW5fZmFpbHVyZV90b19hcHBseSkKIAogICAgIGRl ZiBnZXQoc2VsZiwgYXR0YWNobWVudF9pZF9zdHJpbmcpOgogICAgICAgICBhdHRhY2htZW50X2lk ID0gaW50KGF0dGFjaG1lbnRfaWRfc3RyaW5nKQo=