196599 2019-04-04 07:17:02 -0700 EWS should have a way to retry a patch 2019-10-21 11:34:48 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=202408 https://bugs.webkit.org/show_bug.cgi?id=202424 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard lforschler webkit-bug-importer oldest_to_newest 1524212 0 aakash_jain 2019-04-04 07:17:02 -0700 For example, if a patch depended on another patch, and EWS ran it too early, it shouldn't be necessary to re-upload it. Also, sometimes EWS is just wrong because of flaky trunk. 1524214 1 aakash_jain 2019-04-04 07:17:37 -0700 <rdar://problem/22918898> 1524241 2 webkit-bug-importer 2019-04-04 08:55:08 -0700 <rdar://problem/49608501> 1581578 3 381340 aakash_jain 2019-10-18 15:49:18 -0700 Created attachment 381340 Patch 1581608 4 aakash_jain 2019-10-18 16:46:11 -0700 Tested in: https://ews.webkit-uat.org/status-bubble/380828/ The button UI would need slight polishing. 1581848 5 381340 jbedard 2019-10-21 07:53:40 -0700 Comment on attachment 381340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381340&action=review > Tools/BuildSlaveSupport/ews-app/ews/models/build.py:70 > _log.info('Saved build {} in database for patch_id: {}'.format(uid, patch_id)) Do we have to use *args here? Until this false, everything was using a variable with a descriptive name. I think we either want a named variable or start using kwargs in this call. > Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html:108 > +{% endif %} Were we intending the EWS button style to be improved in this patch or a future one? For what it's worth, the button seems pretty consistent with the existing style. > Tools/BuildSlaveSupport/ews-app/ews/views/retrypatch.py:72 > + return redirect('/status-bubble/{}'.format(patch_id)) Why weren't we redirecting before? 1581872 6 381340 aakash_jain 2019-10-21 10:23:09 -0700 Comment on attachment 381340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381340&action=review >> Tools/BuildSlaveSupport/ews-app/ews/models/build.py:70 >> _log.info('Saved build {} in database for patch_id: {}'.format(uid, patch_id)) > > Do we have to use *args here? Until this false, everything was using a variable with a descriptive name. I think we either want a named variable or start using kwargs in this call. Moved 'retried' variable declaration below complete_at in updated patch, so that we don't have to pass this optional variable while instantiating this class. >> Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html:108 >> +{% endif %} > > Were we intending the EWS button style to be improved in this patch or a future one? > > For what it's worth, the button seems pretty consistent with the existing style. Improved one UI aspect in updated patch, the button was rendering in new line sometimes. >> Tools/BuildSlaveSupport/ews-app/ews/views/retrypatch.py:72 >> + return redirect('/status-bubble/{}'.format(patch_id)) > > Why weren't we redirecting before? It was work-in-progress earlier. It's a better UX to simply refresh the status-bubble on clicking the retry button. Builds which would be retried would turn blue (in-progress), (handled by the changes in statusbubble.py code). 1581873 7 381416 aakash_jain 2019-10-21 10:24:23 -0700 Created attachment 381416 Patch 1581875 8 381416 jbedard 2019-10-21 10:29:45 -0700 Comment on attachment 381416 Patch I like this, do we have an example or a screenshot for the UI change? 1581887 9 aakash_jain 2019-10-21 10:49:21 -0700 (In reply to Jonathan Bedard from comment #8) > Comment on attachment 381416 [details] > Patch > > I like this, do we have an example or a screenshot for the UI change? https://ews.webkit-uat.org/status-bubble/380828/ the 'Retry failed builds' button was being rendered in new-line earlier., Now it's rendered in same line along-with the status-bubbles. 1581909 10 aakash_jain 2019-10-21 11:34:48 -0700 Committed r251368: <https://trac.webkit.org/changeset/251368> 381340 2019-10-18 15:49:18 -0700 2019-10-21 10:24:21 -0700 Patch bug-196599-20191018184917.patch text/plain 9339 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTMwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE5LTEwLTE4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBFV1Mgc2hvdWxkIGhhdmUgYSB3YXkgdG8gcmV0cnkgYSBwYXRjaAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NTk5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZl U3VwcG9ydC9ld3MtYXBwL2V3cy9tb2RlbHMvYnVpbGQucHk6CisgICAgICAgIChCdWlsZCk6IEFk ZCB0aGUgcmV0cmllZCBmaWVsZCB0byBrZWVwIHRyYWNrIG9mIHdoZXRoZXIgYSBidWlsZCBpcyBy ZXF1ZXN0ZWQgdG8gYmUgcmV0cmllZCBvciBub3QuCisgICAgICAgIChCdWlsZC5zZXRfcmV0cmll ZCk6IE1ldGhvZCB0byBzZXQgdGhlIHJldHJpZWQgZmllbGQuCisgICAgICAgICogQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWFwcC9ld3MvdGVtcGxhdGVzL3N0YXR1c2J1YmJsZS5odG1sOiBBZGRlZCB0 aGUgJ1JldHJ5IGZhaWxlZCBidWlsZHMnIGJ1dHRvbi4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYXBwL2V3cy92aWV3cy9yZXRyeXBhdGNoLnB5OgorICAgICAgICAoUmV0cnlQYXRj aC5wb3N0KTogQWRkZWQgYSBjaGVjayBpZiB0aGUgYnVpbGQgaXMgYWxyZWFkeSByZXRyaWVkLiBB bHNvLCBzZXQgdGhlIHJldHJpZWQgZmxhZyBhcHByb3ByaWF0ZWx5LgorICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1YmJsZS5weToKKyAgICAgICAg KFN0YXR1c0J1YmJsZS5fYnVpbGRfYnViYmxlKTogVXBkYXRlZCB0aGUgc3RhdHVzLWJ1YmJsZSB0 byBpbi1wcm9ncmVzcyB3aGlsZSB3YWl0aW5nIGZvciBidWlsZCB0byBiZSByZXRyaWVkLgorICAg ICAgICAoU3RhdHVzQnViYmxlLl9idWlsZF9idWJibGVzX2Zvcl9wYXRjaCk6IERpc3BsYXkgdGhl IHJldHJ5IGJ1dHRvbiBvbmx5IGlmIHRoZXJlIGFyZSBmYWlsZWQgYnVpbGRzLgorICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21pZ3JhdGlvbnMvMDAwMl9idWlsZF9yZXRy aWVkLnB5OiBBZGRlZCBkYXRhYmFzZSBtaWdyYXRpb24uCisKIDIwMTktMTAtMTggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmVt b3ZlIGFuIGV4dHJhbmVvdXMgaGVhZGVyIGltcG9ydCBhZnRlciByMjUxMjc5CkluZGV4OiBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9taWdyYXRpb25zLzAwMDJfYnVpbGRfcmV0 cmllZC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy9taWdyYXRpb25zLzAwMDJfYnVpbGRfcmV0cmllZC5weQkobm9uZXhpc3RlbnQpCisrKyBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9taWdyYXRpb25zLzAwMDJfYnVpbGRfcmV0 cmllZC5weQkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDIwIEBACisjIC0qLSBjb2Rpbmc6IHV0 Zi04IC0qLQorIyBHZW5lcmF0ZWQgYnkgRGphbmdvIDEuMTEuMTYgb24gMjAxOS0xMC0xOCAxODo0 NgorZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCB1bmljb2RlX2xpdGVyYWxzCisKK2Zyb20gZGphbmdv LmRiIGltcG9ydCBtaWdyYXRpb25zLCBtb2RlbHMKKworCitjbGFzcyBNaWdyYXRpb24obWlncmF0 aW9ucy5NaWdyYXRpb24pOgorCisgICAgZGVwZW5kZW5jaWVzID0gWworICAgICAgICAoJ2V3cycs ICcwMDAxX2luaXRpYWwnKSwKKyAgICBdCisKKyAgICBvcGVyYXRpb25zID0gWworICAgICAgICBt aWdyYXRpb25zLkFkZEZpZWxkKAorICAgICAgICAgICAgbW9kZWxfbmFtZT0nYnVpbGQnLAorICAg ICAgICAgICAgbmFtZT0ncmV0cmllZCcsCisgICAgICAgICAgICBmaWVsZD1tb2RlbHMuQm9vbGVh bkZpZWxkKGRlZmF1bHQ9RmFsc2UpLAorICAgICAgICApLAorICAgIF0KSW5kZXg6IFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21vZGVscy9idWlsZC5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9tb2RlbHMvYnVpbGQucHkJKHJl dmlzaW9uIDI1MTMwMykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21v ZGVscy9idWlsZC5weQkod29ya2luZyBjb3B5KQpAQCAtNDIsNiArNDIsNyBAQCBjbGFzcyBCdWls ZChtb2RlbHMuTW9kZWwpOgogICAgIG51bWJlciA9IG1vZGVscy5JbnRlZ2VyRmllbGQoKQogICAg IHJlc3VsdCA9IG1vZGVscy5JbnRlZ2VyRmllbGQobnVsbD1UcnVlLCBibGFuaz1UcnVlKQogICAg IHN0YXRlX3N0cmluZyA9IG1vZGVscy5UZXh0RmllbGQoKQorICAgIHJldHJpZWQgPSBtb2RlbHMu Qm9vbGVhbkZpZWxkKGRlZmF1bHQ9RmFsc2UpCiAgICAgc3RhcnRlZF9hdCA9IG1vZGVscy5JbnRl Z2VyRmllbGQobnVsbD1UcnVlLCBibGFuaz1UcnVlKQogICAgIGNvbXBsZXRlX2F0ID0gbW9kZWxz LkludGVnZXJGaWVsZChudWxsPVRydWUsIGJsYW5rPVRydWUpCiAgICAgY3JlYXRlZCA9IG1vZGVs cy5EYXRlVGltZUZpZWxkKGF1dG9fbm93X2FkZD1UcnVlKQpAQCAtNjUsNyArNjYsNyBAQCBjbGFz cyBCdWlsZChtb2RlbHMuTW9kZWwpOgogICAgICAgICAgICAgcmV0dXJuIEJ1aWxkLnVwZGF0ZV9i dWlsZChidWlsZCwgcGF0Y2hfaWQsIHVpZCwgYnVpbGRlcl9pZCwgYnVpbGRlcl9uYW1lLCBidWls ZGVyX2Rpc3BsYXlfbmFtZSwgbnVtYmVyLCByZXN1bHQsIHN0YXRlX3N0cmluZywgc3RhcnRlZF9h dCwgY29tcGxldGVfYXQpCiAKICAgICAgICAgIyBTYXZlIHRoZSBuZXcgYnVpbGQgZGF0YSwgZS5n LjogYnVpbGQgc3RhcnQgZXZlbnQuCi0gICAgICAgIEJ1aWxkKHBhdGNoX2lkLCB1aWQsIGJ1aWxk ZXJfaWQsIGJ1aWxkZXJfbmFtZSwgYnVpbGRlcl9kaXNwbGF5X25hbWUsIG51bWJlciwgcmVzdWx0 LCBzdGF0ZV9zdHJpbmcsIHN0YXJ0ZWRfYXQsIGNvbXBsZXRlX2F0KS5zYXZlKCkKKyAgICAgICAg QnVpbGQocGF0Y2hfaWQsIHVpZCwgYnVpbGRlcl9pZCwgYnVpbGRlcl9uYW1lLCBidWlsZGVyX2Rp c3BsYXlfbmFtZSwgbnVtYmVyLCByZXN1bHQsIHN0YXRlX3N0cmluZywgRmFsc2UsIHN0YXJ0ZWRf YXQsIGNvbXBsZXRlX2F0KS5zYXZlKCkKICAgICAgICAgX2xvZy5pbmZvKCdTYXZlZCBidWlsZCB7 fSBpbiBkYXRhYmFzZSBmb3IgcGF0Y2hfaWQ6IHt9Jy5mb3JtYXQodWlkLCBwYXRjaF9pZCkpCiAg ICAgICAgIHJldHVybiBTVUNDRVNTCiAKQEAgLTkyLDYgKzkzLDE1IEBAIGNsYXNzIEJ1aWxkKG1v ZGVscy5Nb2RlbCk6CiAgICAgICAgIHJldHVybiBTVUNDRVNTCiAKICAgICBAY2xhc3NtZXRob2QK KyAgICBkZWYgc2V0X3JldHJpZWQoY2xzLCB1aWQsIHJldHJpZWQ9VHJ1ZSk6CisgICAgICAgIGJ1 aWxkID0gQnVpbGQuZ2V0X2V4aXN0aW5nX2J1aWxkKHVpZCkKKyAgICAgICAgaWYgbm90IGJ1aWxk OgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGJ1aWxkLnJldHJpZWQgPSByZXRyaWVkCisg ICAgICAgIGJ1aWxkLnNhdmUodXBkYXRlX2ZpZWxkcz1bJ3JldHJpZWQnLCAnbW9kaWZpZWQnXSkK KyAgICAgICAgX2xvZy5pbmZvKCdVcGRhdGVkIGJ1aWxkIHt9IGluIGRhdGFiYXNlIHdpdGggcmV0 cmllZD17fScuZm9ybWF0KHVpZCwgcmV0cmllZCkpCisKKyAgICBAY2xhc3NtZXRob2QKICAgICBk ZWYgZ2V0X2V4aXN0aW5nX2J1aWxkKGNscywgdWlkKToKICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgcmV0dXJuIEJ1aWxkLm9iamVjdHMuZ2V0KHVpZD11aWQpCkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYXBwL2V3cy90ZW1wbGF0ZXMvc3RhdHVzYnViYmxlLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvdGVtcGxhdGVzL3N0 YXR1c2J1YmJsZS5odG1sCShyZXZpc2lvbiAyNTEzMDMpCisrKyBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYXBwL2V3cy90ZW1wbGF0ZXMvc3RhdHVzYnViYmxlLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTEwMCw2ICsxMDAsMTMgQEAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2Ui LCBmdW5jdAogICA8L2Zvcm0+CiB7JSBlbmRpZiAlfQogCit7JSBpZiBzaG93X3JldHJ5X2J1dHRv biAlfQorICA8Zm9ybSBuYW1lPSJyZXRyeSIgbWV0aG9kPSJQT1NUIiBhY3Rpb249Ii9yZXRyeS8i PnslIGNzcmZfdG9rZW4gJX0KKyAgICA8aW5wdXQgdHlwZT0iaGlkZGVuIiBuYW1lPSJwYXRjaF9p ZCIgdmFsdWU9Int7IHBhdGNoX2lkIH19Ij4KKyAgICA8aW5wdXQgY2xhc3M9InN0YXR1cyIgdHlw ZT0ic3VibWl0IiB2YWx1ZT0iJiM4NjM0OyBSZXRyeSBmYWlsZWQgYnVpbGRzIj4KKyAgPC9mb3Jt PgoreyUgZW5kaWYgJX0KKwogPHNjcmlwdD4KIC8vIENvbnZlcnQgZnJvbSBVVEMgZGF0ZXMgdG8g bG9jYWwuCiB2YXIgYnViYmxlcyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlDbGFzc05hbWUoInN0 YXR1cyIpCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9y ZXRyeXBhdGNoLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1h cHAvZXdzL3ZpZXdzL3JldHJ5cGF0Y2gucHkJKHJldmlzaW9uIDI1MTMwMykKKysrIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3JldHJ5cGF0Y2gucHkJKHdvcmtpbmcg Y29weSkKQEAgLTI1LDExICsyNSwxMiBAQCBmcm9tIF9fZnV0dXJlX18gaW1wb3J0IHVuaWNvZGVf bGl0ZXJhbHMKIGltcG9ydCBsb2dnaW5nCiAKIGZyb20gZGphbmdvLmh0dHAgaW1wb3J0IEh0dHBS ZXNwb25zZQotZnJvbSBkamFuZ28uc2hvcnRjdXRzIGltcG9ydCByZW5kZXIKK2Zyb20gZGphbmdv LnNob3J0Y3V0cyBpbXBvcnQgcmVkaXJlY3QsIHJlbmRlcgogZnJvbSBkamFuZ28udmlld3MgaW1w b3J0IFZpZXcKIGZyb20gZGphbmdvLnZpZXdzLmRlY29yYXRvcnMuY2xpY2tqYWNraW5nIGltcG9y dCB4ZnJhbWVfb3B0aW9uc19leGVtcHQKIAogZnJvbSBld3MuY29tbW9uLmJ1aWxkYm90IGltcG9y dCBCdWlsZGJvdAorZnJvbSBld3MubW9kZWxzLmJ1aWxkIGltcG9ydCBCdWlsZAogZnJvbSBld3Mu bW9kZWxzLnBhdGNoIGltcG9ydCBQYXRjaAogZnJvbSBld3Mudmlld3Muc3RhdHVzYnViYmxlIGlt cG9ydCBTdGF0dXNCdWJibGUKIApAQCAtNTUsMTIgKzU2LDE3IEBAIGNsYXNzIFJldHJ5UGF0Y2go Vmlldyk6CiAKICAgICAgICAgZmFpbGVkX3RvX3JldHJ5X2J1aWxkcyA9IFtdCiAgICAgICAgIGZv ciBidWlsZCBpbiBidWlsZHNfdG9fcmV0cnk6CisgICAgICAgICAgICBpZiBidWlsZC5yZXRyaWVk OgorICAgICAgICAgICAgICAgIF9sb2cud2FybignQnVpbGQge30gZm9yIHBhdGNoIHt9IGlzIGFs cmVhZHkgcmV0cmllZC4nLmZvcm1hdChidWlsZC51aWQsIHBhdGNoX2lkKSkKKyAgICAgICAgICAg ICAgICBjb250aW51ZQorICAgICAgICAgICAgQnVpbGQuc2V0X3JldHJpZWQoYnVpbGQudWlkLCBU cnVlKQogICAgICAgICAgICAgaWYgbm90IEJ1aWxkYm90LnJldHJ5X2J1aWxkKGJ1aWxkLmJ1aWxk ZXJfaWQsIGJ1aWxkLm51bWJlcik6CiAgICAgICAgICAgICAgICAgZmFpbGVkX3RvX3JldHJ5X2J1 aWxkcy5hcHBlbmQoYnVpbGQpCisgICAgICAgICAgICAgICAgQnVpbGQuc2V0X3JldHJpZWQoYnVp bGQudWlkLCBGYWxzZSkKIAogICAgICAgICBpZiBsZW4oZmFpbGVkX3RvX3JldHJ5X2J1aWxkcykg PiAwOgogICAgICAgICAgICAgbWVzc2FnZSA9ICdGYWlsZWQgdG8gcmV0cnkge30gYnVpbGQocykg Zm9yIHBhdGNoIHt9LicuZm9ybWF0KGxlbihmYWlsZWRfdG9fcmV0cnlfYnVpbGRzKSwgcGF0Y2hf aWQpCiAgICAgICAgICAgICBtZXNzYWdlICs9ICcgUGxlYXNlIGNvbnRhY3QgYWRtaW5Ad2Via2l0 Lm9yZyBpZiB0aGUgcHJvYmxlbSBwZXJzaXN0LicKICAgICAgICAgICAgIF9sb2cud2FybihtZXNz YWdlKQogICAgICAgICAgICAgcmV0dXJuIEh0dHBSZXNwb25zZShtZXNzYWdlKQotICAgICAgICBy ZXR1cm4gSHR0cFJlc3BvbnNlKCdTdWJtaXR0ZWQge30gYnVpbGQocykgdG8gRVdTIGZvciByZXRy eSBmb3IgcGF0Y2gge30uJy5mb3JtYXQobGVuKGJ1aWxkc190b19yZXRyeSksIHBhdGNoX2lkKSkK KyAgICAgICAgcmV0dXJuIHJlZGlyZWN0KCcvc3RhdHVzLWJ1YmJsZS97fScuZm9ybWF0KHBhdGNo X2lkKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0 YXR1c2J1YmJsZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YXBwL2V3cy92aWV3cy9zdGF0dXNidWJibGUucHkJKHJldmlzaW9uIDI1MTMwMykKKysrIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1YmJsZS5weQkod29y a2luZyBjb3B5KQpAQCAtOTgsNiArOTgsOSBAQCBjbGFzcyBTdGF0dXNCdWJibGUoVmlldyk6CiAg ICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIGJ1YmJsZVsnc3RhdGUnXSA9ICdzdGFy dGVkJwogICAgICAgICAgICAgYnViYmxlWydkZXRhaWxzX21lc3NhZ2UnXSA9ICdCdWlsZCBpcyBp bi1wcm9ncmVzcy4gUmVjZW50IG1lc3NhZ2VzOicgKyBzZWxmLl9zdGVwc19tZXNzYWdlc19mcm9t X211bHRpcGxlX2J1aWxkcyhidWlsZHMpCisgICAgICAgIGVsaWYgYnVpbGQucmV0cmllZDoKKyAg ICAgICAgICAgIGJ1YmJsZVsnc3RhdGUnXSA9ICdzdGFydGVkJworICAgICAgICAgICAgYnViYmxl WydkZXRhaWxzX21lc3NhZ2UnXSA9ICdXYWl0aW5nIGZvciBhdmFpbGFibGUgYm90IHRvIHJldHJ5 IHRoZSBidWlsZC5cblxuUmVjZW50IG1lc3NhZ2VzOicgKyBzZWxmLl9zdGVwc19tZXNzYWdlc19m cm9tX211bHRpcGxlX2J1aWxkcyhidWlsZHMpCiAgICAgICAgIGVsaWYgYnVpbGQucmVzdWx0ID09 IEJ1aWxkYm90LlNVQ0NFU1M6CiAgICAgICAgICAgICBpZiBpc19wYXJlbnRfYnVpbGQ6CiAgICAg ICAgICAgICAgICAgaWYgcGF0Y2gubW9kaWZpZWQgPCAodGltZXpvbmUubm93KCkgLSBkYXRldGlt ZS50aW1lZGVsdGEoZGF5cz1TdGF0dXNCdWJibGUuREFZU19UT19DSEVDSykpOgpAQCAtMjc2LDEw ICsyNzksMTEgQEAgY2xhc3MgU3RhdHVzQnViYmxlKFZpZXcpOgogICAgIGRlZiBfYnVpbGRfYnVi Ymxlc19mb3JfcGF0Y2goc2VsZiwgcGF0Y2gsIGhpZGVfaWNvbnM9RmFsc2UpOgogICAgICAgICBz aG93X3N1Ym1pdF90b19ld3MgPSBUcnVlCiAgICAgICAgIGZhaWxlZF90b19hcHBseSA9IEZhbHNl ICAjIFRPRE86IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQ1OTgK KyAgICAgICAgc2hvd19yZXRyeSA9IEZhbHNlCiAgICAgICAgIGJ1YmJsZXMgPSBbXQogCiAgICAg ICAgIGlmIG5vdCAocGF0Y2ggYW5kIHBhdGNoLnNlbnRfdG9fYnVpbGRib3QpOgotICAgICAgICAg ICAgcmV0dXJuIChOb25lLCBzaG93X3N1Ym1pdF90b19ld3MsIGZhaWxlZF90b19hcHBseSkKKyAg ICAgICAgICAgIHJldHVybiAoTm9uZSwgc2hvd19zdWJtaXRfdG9fZXdzLCBmYWlsZWRfdG9fYXBw bHksIHNob3dfcmV0cnkpCiAKICAgICAgICAgZm9yIHF1ZXVlIGluIFN0YXR1c0J1YmJsZS5BTExf UVVFVUVTOgogICAgICAgICAgICAgaWYgbm90IHNlbGYuX3Nob3VsZF9zaG93X2J1YmJsZV9mb3Jf cXVldWUocXVldWUpOgpAQCAtMjg5LDIwICsyOTMsMjMgQEAgY2xhc3MgU3RhdHVzQnViYmxlKFZp ZXcpOgogICAgICAgICAgICAgaWYgYnViYmxlOgogICAgICAgICAgICAgICAgIHNob3dfc3VibWl0 X3RvX2V3cyA9IEZhbHNlCiAgICAgICAgICAgICAgICAgYnViYmxlcy5hcHBlbmQoYnViYmxlKQor ICAgICAgICAgICAgICAgIGlmIGJ1YmJsZVsnc3RhdGUnXSBpbiAoJ2ZhaWwnLCAnZXJyb3InKToK KyAgICAgICAgICAgICAgICAgICAgc2hvd19yZXRyeSA9IFRydWUKIAotICAgICAgICByZXR1cm4g KGJ1YmJsZXMsIHNob3dfc3VibWl0X3RvX2V3cywgZmFpbGVkX3RvX2FwcGx5KQorICAgICAgICBy ZXR1cm4gKGJ1YmJsZXMsIHNob3dfc3VibWl0X3RvX2V3cywgZmFpbGVkX3RvX2FwcGx5LCBzaG93 X3JldHJ5KQogCiAgICAgQHhmcmFtZV9vcHRpb25zX2V4ZW1wdAogICAgIGRlZiBnZXQoc2VsZiwg cmVxdWVzdCwgcGF0Y2hfaWQpOgogICAgICAgICBoaWRlX2ljb25zID0gcmVxdWVzdC5HRVQuZ2V0 KCdoaWRlX2ljb25zJywgRmFsc2UpCiAgICAgICAgIHBhdGNoX2lkID0gaW50KHBhdGNoX2lkKQog ICAgICAgICBwYXRjaCA9IFBhdGNoLmdldF9wYXRjaChwYXRjaF9pZCkKLSAgICAgICAgYnViYmxl cywgc2hvd19zdWJtaXRfdG9fZXdzLCBzaG93X2ZhaWx1cmVfdG9fYXBwbHkgPSBzZWxmLl9idWls ZF9idWJibGVzX2Zvcl9wYXRjaChwYXRjaCwgaGlkZV9pY29ucykKKyAgICAgICAgYnViYmxlcywg c2hvd19zdWJtaXRfdG9fZXdzLCBzaG93X2ZhaWx1cmVfdG9fYXBwbHksIHNob3dfcmV0cnkgPSBz ZWxmLl9idWlsZF9idWJibGVzX2Zvcl9wYXRjaChwYXRjaCwgaGlkZV9pY29ucykKIAogICAgICAg ICB0ZW1wbGF0ZV92YWx1ZXMgPSB7CiAgICAgICAgICAgICAnYnViYmxlcyc6IGJ1YmJsZXMsCiAg ICAgICAgICAgICAncGF0Y2hfaWQnOiBwYXRjaF9pZCwKICAgICAgICAgICAgICdzaG93X3N1Ym1p dF90b19ld3MnOiBzaG93X3N1Ym1pdF90b19ld3MsCiAgICAgICAgICAgICAnc2hvd19mYWlsdXJl X3RvX2FwcGx5Jzogc2hvd19mYWlsdXJlX3RvX2FwcGx5LAorICAgICAgICAgICAgJ3Nob3dfcmV0 cnlfYnV0dG9uJzogc2hvd19yZXRyeSwKICAgICAgICAgfQogICAgICAgICByZXR1cm4gcmVuZGVy KHJlcXVlc3QsICdzdGF0dXNidWJibGUuaHRtbCcsIHRlbXBsYXRlX3ZhbHVlcykK 381416 2019-10-21 10:24:23 -0700 2019-10-21 10:47:23 -0700 Patch bug-196599-20191021132422.patch text/plain 8736 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTMwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE5LTEwLTE4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBFV1Mgc2hvdWxkIGhhdmUgYSB3YXkgdG8gcmV0cnkgYSBwYXRjaAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NTk5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZl U3VwcG9ydC9ld3MtYXBwL2V3cy9tb2RlbHMvYnVpbGQucHk6CisgICAgICAgIChCdWlsZCk6IEFk ZCB0aGUgcmV0cmllZCBmaWVsZCB0byBrZWVwIHRyYWNrIG9mIHdoZXRoZXIgYSBidWlsZCBpcyBy ZXF1ZXN0ZWQgdG8gYmUgcmV0cmllZCBvciBub3QuCisgICAgICAgIChCdWlsZC5zZXRfcmV0cmll ZCk6IE1ldGhvZCB0byBzZXQgdGhlIHJldHJpZWQgZmllbGQuCisgICAgICAgICogQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWFwcC9ld3MvdGVtcGxhdGVzL3N0YXR1c2J1YmJsZS5odG1sOiBBZGRlZCB0 aGUgJ1JldHJ5IGZhaWxlZCBidWlsZHMnIGJ1dHRvbi4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYXBwL2V3cy92aWV3cy9yZXRyeXBhdGNoLnB5OgorICAgICAgICAoUmV0cnlQYXRj aC5wb3N0KTogQWRkZWQgYSBjaGVjayBpZiB0aGUgYnVpbGQgaXMgYWxyZWFkeSByZXRyaWVkLiBB bHNvLCBzZXQgdGhlIHJldHJpZWQgZmxhZyBhcHByb3ByaWF0ZWx5LgorICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1YmJsZS5weToKKyAgICAgICAg KFN0YXR1c0J1YmJsZS5fYnVpbGRfYnViYmxlKTogVXBkYXRlZCB0aGUgc3RhdHVzLWJ1YmJsZSB0 byBpbi1wcm9ncmVzcyB3aGlsZSB3YWl0aW5nIGZvciBidWlsZCB0byBiZSByZXRyaWVkLgorICAg ICAgICAoU3RhdHVzQnViYmxlLl9idWlsZF9idWJibGVzX2Zvcl9wYXRjaCk6IERpc3BsYXkgdGhl IHJldHJ5IGJ1dHRvbiBvbmx5IGlmIHRoZXJlIGFyZSBmYWlsZWQgYnVpbGRzLgorICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21pZ3JhdGlvbnMvMDAwMl9idWlsZF9yZXRy aWVkLnB5OiBBZGRlZCBkYXRhYmFzZSBtaWdyYXRpb24uCisKIDIwMTktMTAtMTggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmVt b3ZlIGFuIGV4dHJhbmVvdXMgaGVhZGVyIGltcG9ydCBhZnRlciByMjUxMjc5CkluZGV4OiBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9taWdyYXRpb25zLzAwMDJfYnVpbGRfcmV0 cmllZC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy9taWdyYXRpb25zLzAwMDJfYnVpbGRfcmV0cmllZC5weQkobm9uZXhpc3RlbnQpCisrKyBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9taWdyYXRpb25zLzAwMDJfYnVpbGRfcmV0 cmllZC5weQkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDIwIEBACisjIC0qLSBjb2Rpbmc6IHV0 Zi04IC0qLQorIyBHZW5lcmF0ZWQgYnkgRGphbmdvIDEuMTEuMTYgb24gMjAxOS0xMC0xOCAxODo0 NgorZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCB1bmljb2RlX2xpdGVyYWxzCisKK2Zyb20gZGphbmdv LmRiIGltcG9ydCBtaWdyYXRpb25zLCBtb2RlbHMKKworCitjbGFzcyBNaWdyYXRpb24obWlncmF0 aW9ucy5NaWdyYXRpb24pOgorCisgICAgZGVwZW5kZW5jaWVzID0gWworICAgICAgICAoJ2V3cycs ICcwMDAxX2luaXRpYWwnKSwKKyAgICBdCisKKyAgICBvcGVyYXRpb25zID0gWworICAgICAgICBt aWdyYXRpb25zLkFkZEZpZWxkKAorICAgICAgICAgICAgbW9kZWxfbmFtZT0nYnVpbGQnLAorICAg ICAgICAgICAgbmFtZT0ncmV0cmllZCcsCisgICAgICAgICAgICBmaWVsZD1tb2RlbHMuQm9vbGVh bkZpZWxkKGRlZmF1bHQ9RmFsc2UpLAorICAgICAgICApLAorICAgIF0KSW5kZXg6IFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21vZGVscy9idWlsZC5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9tb2RlbHMvYnVpbGQucHkJKHJl dmlzaW9uIDI1MTM2NykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21v ZGVscy9idWlsZC5weQkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsNyBAQCBjbGFzcyBCdWls ZChtb2RlbHMuTW9kZWwpOgogICAgIHN0YXRlX3N0cmluZyA9IG1vZGVscy5UZXh0RmllbGQoKQog ICAgIHN0YXJ0ZWRfYXQgPSBtb2RlbHMuSW50ZWdlckZpZWxkKG51bGw9VHJ1ZSwgYmxhbms9VHJ1 ZSkKICAgICBjb21wbGV0ZV9hdCA9IG1vZGVscy5JbnRlZ2VyRmllbGQobnVsbD1UcnVlLCBibGFu az1UcnVlKQorICAgIHJldHJpZWQgPSBtb2RlbHMuQm9vbGVhbkZpZWxkKGRlZmF1bHQ9RmFsc2Up CiAgICAgY3JlYXRlZCA9IG1vZGVscy5EYXRlVGltZUZpZWxkKGF1dG9fbm93X2FkZD1UcnVlKQog ICAgIG1vZGlmaWVkID0gbW9kZWxzLkRhdGVUaW1lRmllbGQoYXV0b19ub3c9VHJ1ZSkKIApAQCAt OTIsNiArOTMsMTUgQEAgY2xhc3MgQnVpbGQobW9kZWxzLk1vZGVsKToKICAgICAgICAgcmV0dXJu IFNVQ0NFU1MKIAogICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBzZXRfcmV0cmllZChjbHMsIHVp ZCwgcmV0cmllZD1UcnVlKToKKyAgICAgICAgYnVpbGQgPSBCdWlsZC5nZXRfZXhpc3RpbmdfYnVp bGQodWlkKQorICAgICAgICBpZiBub3QgYnVpbGQ6CisgICAgICAgICAgICByZXR1cm4KKyAgICAg ICAgYnVpbGQucmV0cmllZCA9IHJldHJpZWQKKyAgICAgICAgYnVpbGQuc2F2ZSh1cGRhdGVfZmll bGRzPVsncmV0cmllZCcsICdtb2RpZmllZCddKQorICAgICAgICBfbG9nLmluZm8oJ1VwZGF0ZWQg YnVpbGQge30gaW4gZGF0YWJhc2Ugd2l0aCByZXRyaWVkPXt9Jy5mb3JtYXQodWlkLCByZXRyaWVk KSkKKworICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBnZXRfZXhpc3RpbmdfYnVpbGQoY2xzLCB1 aWQpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICByZXR1cm4gQnVpbGQub2JqZWN0cy5nZXQo dWlkPXVpZCkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3RlbXBs YXRlcy9zdGF0dXNidWJibGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYXBwL2V3cy90ZW1wbGF0ZXMvc3RhdHVzYnViYmxlLmh0bWwJKHJldmlzaW9uIDI1 MTM2NykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3RlbXBsYXRlcy9z dGF0dXNidWJibGUuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsNyBAQCBib2R5IHsK ICAgICBmb250LXNpemU6IDlweDsKIH0KIGZvcm0geworICAgIGZsb2F0OiBsZWZ0OwogICAgIGRp c3BsYXk6IGJsb2NrOwogfQogPC9zdHlsZT4KQEAgLTEwMCw2ICsxMDEsMTMgQEAgd2luZG93LmFk ZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCBmdW5jdAogICA8L2Zvcm0+CiB7JSBlbmRpZiAlfQog Cit7JSBpZiBzaG93X3JldHJ5X2J1dHRvbiAlfQorICA8Zm9ybSBuYW1lPSJyZXRyeSIgbWV0aG9k PSJQT1NUIiBhY3Rpb249Ii9yZXRyeS8iPnslIGNzcmZfdG9rZW4gJX0KKyAgICA8aW5wdXQgdHlw ZT0iaGlkZGVuIiBuYW1lPSJwYXRjaF9pZCIgdmFsdWU9Int7IHBhdGNoX2lkIH19Ij4KKyAgICA8 aW5wdXQgY2xhc3M9InN0YXR1cyIgdHlwZT0ic3VibWl0IiB2YWx1ZT0iJiM4NjM1OyBSZXRyeSBm YWlsZWQgYnVpbGRzIj4KKyAgPC9mb3JtPgoreyUgZW5kaWYgJX0KKwogPHNjcmlwdD4KIC8vIENv bnZlcnQgZnJvbSBVVEMgZGF0ZXMgdG8gbG9jYWwuCiB2YXIgYnViYmxlcyA9IGRvY3VtZW50Lmdl dEVsZW1lbnRzQnlDbGFzc05hbWUoInN0YXR1cyIpCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYXBwL2V3cy92aWV3cy9yZXRyeXBhdGNoLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3JldHJ5cGF0Y2gucHkJKHJldmlz aW9uIDI1MTM2NykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdz L3JldHJ5cGF0Y2gucHkJKHdvcmtpbmcgY29weSkKQEAgLTI1LDExICsyNSwxMiBAQCBmcm9tIF9f ZnV0dXJlX18gaW1wb3J0IHVuaWNvZGVfbGl0ZXJhbHMKIGltcG9ydCBsb2dnaW5nCiAKIGZyb20g ZGphbmdvLmh0dHAgaW1wb3J0IEh0dHBSZXNwb25zZQotZnJvbSBkamFuZ28uc2hvcnRjdXRzIGlt cG9ydCByZW5kZXIKK2Zyb20gZGphbmdvLnNob3J0Y3V0cyBpbXBvcnQgcmVkaXJlY3QsIHJlbmRl cgogZnJvbSBkamFuZ28udmlld3MgaW1wb3J0IFZpZXcKIGZyb20gZGphbmdvLnZpZXdzLmRlY29y YXRvcnMuY2xpY2tqYWNraW5nIGltcG9ydCB4ZnJhbWVfb3B0aW9uc19leGVtcHQKIAogZnJvbSBl d3MuY29tbW9uLmJ1aWxkYm90IGltcG9ydCBCdWlsZGJvdAorZnJvbSBld3MubW9kZWxzLmJ1aWxk IGltcG9ydCBCdWlsZAogZnJvbSBld3MubW9kZWxzLnBhdGNoIGltcG9ydCBQYXRjaAogZnJvbSBl d3Mudmlld3Muc3RhdHVzYnViYmxlIGltcG9ydCBTdGF0dXNCdWJibGUKIApAQCAtNTUsMTIgKzU2 LDE3IEBAIGNsYXNzIFJldHJ5UGF0Y2goVmlldyk6CiAKICAgICAgICAgZmFpbGVkX3RvX3JldHJ5 X2J1aWxkcyA9IFtdCiAgICAgICAgIGZvciBidWlsZCBpbiBidWlsZHNfdG9fcmV0cnk6CisgICAg ICAgICAgICBpZiBidWlsZC5yZXRyaWVkOgorICAgICAgICAgICAgICAgIF9sb2cud2FybignQnVp bGQge30gZm9yIHBhdGNoIHt9IGlzIGFscmVhZHkgcmV0cmllZC4nLmZvcm1hdChidWlsZC51aWQs IHBhdGNoX2lkKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgQnVpbGQu c2V0X3JldHJpZWQoYnVpbGQudWlkLCBUcnVlKQogICAgICAgICAgICAgaWYgbm90IEJ1aWxkYm90 LnJldHJ5X2J1aWxkKGJ1aWxkLmJ1aWxkZXJfaWQsIGJ1aWxkLm51bWJlcik6CiAgICAgICAgICAg ICAgICAgZmFpbGVkX3RvX3JldHJ5X2J1aWxkcy5hcHBlbmQoYnVpbGQpCisgICAgICAgICAgICAg ICAgQnVpbGQuc2V0X3JldHJpZWQoYnVpbGQudWlkLCBGYWxzZSkKIAogICAgICAgICBpZiBsZW4o ZmFpbGVkX3RvX3JldHJ5X2J1aWxkcykgPiAwOgogICAgICAgICAgICAgbWVzc2FnZSA9ICdGYWls ZWQgdG8gcmV0cnkge30gYnVpbGQocykgZm9yIHBhdGNoIHt9LicuZm9ybWF0KGxlbihmYWlsZWRf dG9fcmV0cnlfYnVpbGRzKSwgcGF0Y2hfaWQpCiAgICAgICAgICAgICBtZXNzYWdlICs9ICcgUGxl YXNlIGNvbnRhY3QgYWRtaW5Ad2Via2l0Lm9yZyBpZiB0aGUgcHJvYmxlbSBwZXJzaXN0LicKICAg ICAgICAgICAgIF9sb2cud2FybihtZXNzYWdlKQogICAgICAgICAgICAgcmV0dXJuIEh0dHBSZXNw b25zZShtZXNzYWdlKQotICAgICAgICByZXR1cm4gSHR0cFJlc3BvbnNlKCdTdWJtaXR0ZWQge30g YnVpbGQocykgdG8gRVdTIGZvciByZXRyeSBmb3IgcGF0Y2gge30uJy5mb3JtYXQobGVuKGJ1aWxk c190b19yZXRyeSksIHBhdGNoX2lkKSkKKyAgICAgICAgcmV0dXJuIHJlZGlyZWN0KCcvc3RhdHVz LWJ1YmJsZS97fScuZm9ybWF0KHBhdGNoX2lkKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1YmJsZS5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy92aWV3cy9zdGF0dXNidWJibGUucHkJKHJl dmlzaW9uIDI1MTM2NykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3Zp ZXdzL3N0YXR1c2J1YmJsZS5weQkod29ya2luZyBjb3B5KQpAQCAtOTgsNiArOTgsOSBAQCBjbGFz cyBTdGF0dXNCdWJibGUoVmlldyk6CiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAg IGJ1YmJsZVsnc3RhdGUnXSA9ICdzdGFydGVkJwogICAgICAgICAgICAgYnViYmxlWydkZXRhaWxz X21lc3NhZ2UnXSA9ICdCdWlsZCBpcyBpbi1wcm9ncmVzcy4gUmVjZW50IG1lc3NhZ2VzOicgKyBz ZWxmLl9zdGVwc19tZXNzYWdlc19mcm9tX211bHRpcGxlX2J1aWxkcyhidWlsZHMpCisgICAgICAg IGVsaWYgYnVpbGQucmV0cmllZDoKKyAgICAgICAgICAgIGJ1YmJsZVsnc3RhdGUnXSA9ICdzdGFy dGVkJworICAgICAgICAgICAgYnViYmxlWydkZXRhaWxzX21lc3NhZ2UnXSA9ICdXYWl0aW5nIGZv ciBhdmFpbGFibGUgYm90IHRvIHJldHJ5IHRoZSBidWlsZC5cblxuUmVjZW50IG1lc3NhZ2VzOicg KyBzZWxmLl9zdGVwc19tZXNzYWdlc19mcm9tX211bHRpcGxlX2J1aWxkcyhidWlsZHMpCiAgICAg ICAgIGVsaWYgYnVpbGQucmVzdWx0ID09IEJ1aWxkYm90LlNVQ0NFU1M6CiAgICAgICAgICAgICBp ZiBpc19wYXJlbnRfYnVpbGQ6CiAgICAgICAgICAgICAgICAgaWYgcGF0Y2gubW9kaWZpZWQgPCAo dGltZXpvbmUubm93KCkgLSBkYXRldGltZS50aW1lZGVsdGEoZGF5cz1TdGF0dXNCdWJibGUuREFZ U19UT19DSEVDSykpOgpAQCAtMjc2LDEwICsyNzksMTEgQEAgY2xhc3MgU3RhdHVzQnViYmxlKFZp ZXcpOgogICAgIGRlZiBfYnVpbGRfYnViYmxlc19mb3JfcGF0Y2goc2VsZiwgcGF0Y2gsIGhpZGVf aWNvbnM9RmFsc2UpOgogICAgICAgICBzaG93X3N1Ym1pdF90b19ld3MgPSBUcnVlCiAgICAgICAg IGZhaWxlZF90b19hcHBseSA9IEZhbHNlICAjIFRPRE86IGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTQ1OTgKKyAgICAgICAgc2hvd19yZXRyeSA9IEZhbHNlCiAgICAg ICAgIGJ1YmJsZXMgPSBbXQogCiAgICAgICAgIGlmIG5vdCAocGF0Y2ggYW5kIHBhdGNoLnNlbnRf dG9fYnVpbGRib3QpOgotICAgICAgICAgICAgcmV0dXJuIChOb25lLCBzaG93X3N1Ym1pdF90b19l d3MsIGZhaWxlZF90b19hcHBseSkKKyAgICAgICAgICAgIHJldHVybiAoTm9uZSwgc2hvd19zdWJt aXRfdG9fZXdzLCBmYWlsZWRfdG9fYXBwbHksIHNob3dfcmV0cnkpCiAKICAgICAgICAgZm9yIHF1 ZXVlIGluIFN0YXR1c0J1YmJsZS5BTExfUVVFVUVTOgogICAgICAgICAgICAgaWYgbm90IHNlbGYu X3Nob3VsZF9zaG93X2J1YmJsZV9mb3JfcXVldWUocXVldWUpOgpAQCAtMjg5LDIwICsyOTMsMjMg QEAgY2xhc3MgU3RhdHVzQnViYmxlKFZpZXcpOgogICAgICAgICAgICAgaWYgYnViYmxlOgogICAg ICAgICAgICAgICAgIHNob3dfc3VibWl0X3RvX2V3cyA9IEZhbHNlCiAgICAgICAgICAgICAgICAg YnViYmxlcy5hcHBlbmQoYnViYmxlKQorICAgICAgICAgICAgICAgIGlmIGJ1YmJsZVsnc3RhdGUn XSBpbiAoJ2ZhaWwnLCAnZXJyb3InKToKKyAgICAgICAgICAgICAgICAgICAgc2hvd19yZXRyeSA9 IFRydWUKIAotICAgICAgICByZXR1cm4gKGJ1YmJsZXMsIHNob3dfc3VibWl0X3RvX2V3cywgZmFp bGVkX3RvX2FwcGx5KQorICAgICAgICByZXR1cm4gKGJ1YmJsZXMsIHNob3dfc3VibWl0X3RvX2V3 cywgZmFpbGVkX3RvX2FwcGx5LCBzaG93X3JldHJ5KQogCiAgICAgQHhmcmFtZV9vcHRpb25zX2V4 ZW1wdAogICAgIGRlZiBnZXQoc2VsZiwgcmVxdWVzdCwgcGF0Y2hfaWQpOgogICAgICAgICBoaWRl X2ljb25zID0gcmVxdWVzdC5HRVQuZ2V0KCdoaWRlX2ljb25zJywgRmFsc2UpCiAgICAgICAgIHBh dGNoX2lkID0gaW50KHBhdGNoX2lkKQogICAgICAgICBwYXRjaCA9IFBhdGNoLmdldF9wYXRjaChw YXRjaF9pZCkKLSAgICAgICAgYnViYmxlcywgc2hvd19zdWJtaXRfdG9fZXdzLCBzaG93X2ZhaWx1 cmVfdG9fYXBwbHkgPSBzZWxmLl9idWlsZF9idWJibGVzX2Zvcl9wYXRjaChwYXRjaCwgaGlkZV9p Y29ucykKKyAgICAgICAgYnViYmxlcywgc2hvd19zdWJtaXRfdG9fZXdzLCBzaG93X2ZhaWx1cmVf dG9fYXBwbHksIHNob3dfcmV0cnkgPSBzZWxmLl9idWlsZF9idWJibGVzX2Zvcl9wYXRjaChwYXRj aCwgaGlkZV9pY29ucykKIAogICAgICAgICB0ZW1wbGF0ZV92YWx1ZXMgPSB7CiAgICAgICAgICAg ICAnYnViYmxlcyc6IGJ1YmJsZXMsCiAgICAgICAgICAgICAncGF0Y2hfaWQnOiBwYXRjaF9pZCwK ICAgICAgICAgICAgICdzaG93X3N1Ym1pdF90b19ld3MnOiBzaG93X3N1Ym1pdF90b19ld3MsCiAg ICAgICAgICAgICAnc2hvd19mYWlsdXJlX3RvX2FwcGx5Jzogc2hvd19mYWlsdXJlX3RvX2FwcGx5 LAorICAgICAgICAgICAgJ3Nob3dfcmV0cnlfYnV0dG9uJzogc2hvd19yZXRyeSwKICAgICAgICAg fQogICAgICAgICByZXR1cm4gcmVuZGVyKHJlcXVlc3QsICdzdGF0dXNidWJibGUuaHRtbCcsIHRl bXBsYXRlX3ZhbHVlcykK