206532 2020-01-21 07:38:32 -0800 [ews] commit-queue should verify patch committer and reviewer 2020-03-20 14:20:14 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 201934 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1609030 0 aakash_jain 2020-01-21 07:38:32 -0800 commit-queue should verify patch committer and reviewer from https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/common/config/contributors.json and not land the patch in case committer and reviewer's don't have required privileges. 1609031 1 webkit-bug-importer 2020-01-21 07:38:47 -0800 <rdar://problem/58758869> 1622762 2 391689 aakash_jain 2020-02-25 14:36:59 -0800 Created attachment 391689 Patch 1622763 3 aakash_jain 2020-02-25 14:40:58 -0800 Sample runs: https://ews-build.webkit-uat.org/#/builders/26/builds/826 https://ews-build.webkit-uat.org/#/builders/26/builds/836 https://ews-build.webkit-uat.org/#/builders/26/builds/835 1622782 4 391692 aakash_jain 2020-02-25 15:28:32 -0800 Created attachment 391692 Patch 1622999 5 391692 jbedard 2020-02-26 07:51:15 -0800 Comment on attachment 391692 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391692&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:653 > + def load_contributors(self): This function is weird. At the moment, we only call it in the constructor and it sets up a cache, where it will return values. But that doesn't make sense because it's called in the constructor. Seems to me that we should either git rid of the early return and stop returning values since we don't actually use the returned values, or have this function only return the dictionary to the contributors which we then assign to the cache in the constructor. 1623036 6 391751 aakash_jain 2020-02-26 09:44:26 -0800 Created attachment 391751 Patch 1623048 7 aakash_jain 2020-02-26 10:00:18 -0800 (In reply to Jonathan Bedard from comment #5) > or have this function only return the dictionary of the contributors which we then assign to the cache in the constructor. Done in updated patch. 1623049 8 391751 jbedard 2020-02-26 10:03:11 -0800 Comment on attachment 391751 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391751&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:626 > + if not self.contributors: This new code made me realize that this data is cached at the class level, which I didn't notice before. First, I'm not sure we should cache it, we want to pick up when new contributors are added, right? And reading contributors shouldn't take too long, it seems fine to do it every time we construct the step. Second, we should declare load_contributors as a class method because that's what it is. 1623055 9 391755 aakash_jain 2020-02-26 10:50:49 -0800 Created attachment 391755 Patch 1623057 10 aakash_jain 2020-02-26 10:56:10 -0800 (In reply to Jonathan Bedard from comment #8) > First, I'm not sure we should cache it, we want to pick up when new contributors are added, right? Agree, updated in new patch. Also buildbot loads the __init__ method at the 'buildbot start' time, which we don't want. So moved the call to load load_contributors() inside start() and deleted __init__. Also I did some testing for network errors and improved error handling for the case when we are unable to load contributors.json. Tested in https://ews-build.webkit-uat.org/#/builders/26/builds/878 > Second, we should declare load_contributors as a class method because that's what it is. We are using self._addToLog inside this method to display the error message in UI. Need to keep it instance method for that. 1623075 11 391755 jbedard 2020-02-26 11:22:43 -0800 Comment on attachment 391755 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391755&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:632 > + return {} My only question here is: Should we used the cached version if we fail to load? 1623085 12 aakash_jain 2020-02-26 11:40:42 -0800 (In reply to Jonathan Bedard from comment #11) > My only question here is: Should we used the cached version if we fail to load? Let's start with this simple approach for now. Will add the caching logic later if needed. 1623086 13 aakash_jain 2020-02-26 11:42:51 -0800 Committed r257498: <https://trac.webkit.org/changeset/257498> 1632274 14 aakash_jain 2020-03-20 14:20:14 -0700 Seems to be working fine. e.g.: https://ews-build.webkit.org/#/builders/28/builds/99 391689 2020-02-25 14:36:59 -0800 2020-02-25 15:28:29 -0800 Patch bug-206532-20200225173658.patch text/plain 5204 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NzM3NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTAyLTI1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIHZlcmlmeSBwYXRjaCBjb21t aXR0ZXIgYW5kIHJldmlld2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDY1MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAg ICAgKFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlcik6IEJ1aWxkIHN0ZXAgdG8gdmFsaWRhdGUg cGF0Y2ggY29tbWl0ZXIgYW5kIHJldmlld2VyLgorICAgICAgICAoVmFsaWRhdGVDb21taXRlckFu ZFJldmlld2VyLl9hZGRUb0xvZyk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZ2V0UmVzdWx0U3VtbWFyeSk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZmFpbF9idWlsZCk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIubG9h ZF9jb250cmlidXRvcnMpOiBMb2FkIGNvbnRyaWJ1dG9ycyBpbmZvcm1hdGlvbi4KKyAgICAgICAg KFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlci5pc19yZXZpZXdlcik6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuaXNfY29tbWl0dGVyKToKKyAgICAgICAgKFZhbGlkYXRl Q29tbWl0ZXJBbmRSZXZpZXdlci5mdWxsX25hbWVfZnJvbV9lbWFpbCk6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuc3RhcnQpOgorCiAyMDIwLTAyLTI1ICBEYW5pZWwgQmF0 ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXN0V2ViS2l0QVBJLlBhc3RlTWl4 ZWRDb250ZW50LkNvcHlBbmRQYXN0ZVdpdGhDdXN0b21QYXN0ZWJvYXJkRGF0YU9ubHkgc2hvdWxk IHdhaXQgdW50aWwgY29weSBvcGVyYXRpb24gY29tcGxldGVzCkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNTczNzIpCisrKyBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAg LTYxNCw2ICs2MTQsOTIgQEAgY2xhc3MgVmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVw LAogICAgICAgICByZXR1cm4gTm9uZQogCiAKK2NsYXNzIFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZp ZXdlcihidWlsZHN0ZXAuQnVpbGRTdGVwKToKKyAgICBuYW1lID0gJ3ZhbGlkYXRlLWNvbW1pdGVy LWFuZC1yZXZpZXdlcicKKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ1ZhbGlkYXRlZCBjb21taXRl ciBhbmQgcmV2aWV3ZXInXQorICAgIHVybCA9ICdodHRwczovL3RyYWMud2Via2l0Lm9yZy9icm93 c2VyL3dlYmtpdC90cnVuay9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29u dHJpYnV0b3JzLmpzb24nCisgICAgdXJsX3RleHQgPSAne30/Zm9ybWF0PXR4dCcuZm9ybWF0KHVy bCkKKyAgICBjb250cmlidXRvcnMgPSB7fQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAg ICAgICBidWlsZHN0ZXAuQnVpbGRTdGVwLl9faW5pdF9fKHNlbGYpCisgICAgICAgIHNlbGYubG9h ZF9jb250cmlidXRvcnMoKQorCisgICAgQGRlZmVyLmlubGluZUNhbGxiYWNrcworICAgIGRlZiBf YWRkVG9Mb2coc2VsZiwgbG9nTmFtZSwgbWVzc2FnZSk6CisgICAgICAgIHRyeToKKyAgICAgICAg ICAgIGxvZyA9IHNlbGYuZ2V0TG9nKGxvZ05hbWUpCisgICAgICAgIGV4Y2VwdCBLZXlFcnJvcjoK KyAgICAgICAgICAgIGxvZyA9IHlpZWxkIHNlbGYuYWRkTG9nKGxvZ05hbWUpCisgICAgICAgIGxv Zy5hZGRTdGRvdXQobWVzc2FnZSkKKworICAgIGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgor ICAgICAgICBpZiBzZWxmLnJlc3VsdHMgPT0gRkFJTFVSRToKKyAgICAgICAgICAgIHJldHVybiB7 dSdzdGVwJzogdW5pY29kZShzZWxmLmRlc2NyaXB0aW9uRG9uZSl9CisgICAgICAgIHJldHVybiBi dWlsZHN0ZXAuQnVpbGRTdGVwLmdldFJlc3VsdFN1bW1hcnkoc2VsZikKKworICAgIGRlZiBmYWls X2J1aWxkKHNlbGYsIGVtYWlsLCBzdGF0dXMpOgorICAgICAgICByZWFzb24gPSAne30gZG9lcyBu b3QgaGF2ZSB7fSBwZXJtaXNzaW9ucycuZm9ybWF0KGVtYWlsLCBzdGF0dXMpCisgICAgICAgIGNv bW1lbnQgPSAne30gZG9lcyBub3QgaGF2ZSB7fSBwZXJtaXNzaW9ucyBhY2NvcmRpbmcgdG8ge30u Jy5mb3JtYXQoZW1haWwsIHN0YXR1cywgc2VsZi51cmwpCisgICAgICAgIGNvbW1lbnQgKz0gJ1xu XG5SZWplY3RpbmcgYXR0YWNobWVudCB7fSBmcm9tIGNvbW1pdCBxdWV1ZS4nLmZvcm1hdChzZWxm LmdldFByb3BlcnR5KCdwYXRjaF9pZCcsICcnKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgn YnVnemlsbGFfY29tbWVudF90ZXh0JywgY29tbWVudCkKKworICAgICAgICBzZWxmLl9hZGRUb0xv Zygnc3RkaW8nLCByZWFzb24pCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkX2Zpbmlz aF9zdW1tYXJ5JywgcmVhc29uKQorICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJy ZW50U3RlcChbQ29tbWVudE9uQnVnKCksIFNldENvbW1pdFF1ZXVlTWludXNGbGFnT25QYXRjaCgp XSkKKyAgICAgICAgc2VsZi5maW5pc2hlZChGQUlMVVJFKQorICAgICAgICBzZWxmLmRlc2NyaXB0 aW9uRG9uZSA9IHJlYXNvbgorCisgICAgZGVmIGxvYWRfY29udHJpYnV0b3JzKHNlbGYpOgorICAg ICAgICBpZiBzZWxmLmNvbnRyaWJ1dG9yczoKKyAgICAgICAgICAgIHJldHVybiBzZWxmLmNvbnRy aWJ1dG9ycworICAgICAgICBzZWxmLmNvbnRyaWJ1dG9ycyA9IHt9CisgICAgICAgIHJlc3BvbnNl ID0gcmVxdWVzdHMuZ2V0KHNlbGYudXJsX3RleHQpCisgICAgICAgIGlmIChub3QgcmVzcG9uc2Up IG9yIChyZXNwb25zZS5zdGF0dXNfY29kZSAhPSAyMDApOgorICAgICAgICAgICAgcmV0dXJuIHt9 CisgICAgICAgIGNvbnRyaWJ1dG9ycyA9IHJlc3BvbnNlLmpzb24oKQorICAgICAgICBmb3Iga2V5 LCB2YWx1ZSBpbiBjb250cmlidXRvcnMuaXRlcml0ZW1zKCk6CisgICAgICAgICAgICBlbWFpbHMg PSB2YWx1ZS5nZXQoJ2VtYWlscycpCisgICAgICAgICAgICBmb3IgZW1haWwgaW4gZW1haWxzOgor ICAgICAgICAgICAgICAgIHNlbGYuY29udHJpYnV0b3JzW2VtYWlsXSA9IHsnbmFtZSc6IGtleSwg J3N0YXR1cyc6IHZhbHVlLmdldCgnc3RhdHVzJyl9CisgICAgICAgIHJldHVybiBzZWxmLmNvbnRy aWJ1dG9ycworCisgICAgZGVmIGlzX3Jldmlld2VyKHNlbGYsIGVtYWlsKToKKyAgICAgICAgY29u dHJpYnV0b3IgPSBzZWxmLmNvbnRyaWJ1dG9ycy5nZXQoZW1haWwpCisgICAgICAgIHJldHVybiBj b250cmlidXRvciBhbmQgY29udHJpYnV0b3JbJ3N0YXR1cyddID09ICdyZXZpZXdlcicKKworICAg IGRlZiBpc19jb21taXR0ZXIoc2VsZiwgZW1haWwpOgorICAgICAgICBjb250cmlidXRvciA9IHNl bGYuY29udHJpYnV0b3JzLmdldChlbWFpbCkKKyAgICAgICAgcmV0dXJuIGNvbnRyaWJ1dG9yIGFu ZCBjb250cmlidXRvclsnc3RhdHVzJ10gaW4gWydyZXZpZXdlcicsICdjb21taXR0ZXInXQorCisg ICAgZGVmIGZ1bGxfbmFtZV9mcm9tX2VtYWlsKHNlbGYsIGVtYWlsKToKKyAgICAgICAgY29udHJp YnV0b3IgPSBzZWxmLmNvbnRyaWJ1dG9ycy5nZXQoZW1haWwpCisgICAgICAgIGlmIG5vdCBjb250 cmlidXRvcjoKKyAgICAgICAgICAgIHJldHVybiAnJworICAgICAgICByZXR1cm4gY29udHJpYnV0 b3IuZ2V0KCduYW1lJykKKworICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgcGF0Y2hfY29t bWl0dGVyID0gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hfY29tbWl0dGVyJywgJycpCisgICAgICAg IGlmIG5vdCBzZWxmLmlzX2NvbW1pdHRlcihwYXRjaF9jb21taXR0ZXIpOgorICAgICAgICAgICAg c2VsZi5mYWlsX2J1aWxkKHBhdGNoX2NvbW1pdHRlciwgJ2NvbW1pdHRlcicpCisgICAgICAgICAg ICByZXR1cm4gTm9uZQorICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAne30gaXMgYSB2 YWxpZCBjb21taXRlci5cbicuZm9ybWF0KHBhdGNoX2NvbW1pdHRlcikpCisKKyAgICAgICAgcGF0 Y2hfcmV2aWV3ZXIgPSBzZWxmLmdldFByb3BlcnR5KCdwYXRjaF9yZXZpZXdlcicsICcnKQorICAg ICAgICBpZiBub3QgcGF0Y2hfcmV2aWV3ZXI6CisgICAgICAgICAgICAjIFBhdGNoIGlzIG5vdCBy K2VkLiBDaGFuZ2VMb2cgbWlnaHQgaGF2ZSAnUmV2aWV3ZWQgYnknIGluIGl0LgorICAgICAgICAg ICAgc2VsZi5maW5pc2hlZChTVUNDRVNTKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9yZXZpZXdlcl9mdWxsX25hbWUnLCBzZWxmLmZ1 bGxfbmFtZV9mcm9tX2VtYWlsKHBhdGNoX3Jldmlld2VyKSkKKyAgICAgICAgaWYgbm90IHNlbGYu aXNfcmV2aWV3ZXIocGF0Y2hfcmV2aWV3ZXIpOgorICAgICAgICAgICAgc2VsZi5mYWlsX2J1aWxk KHBhdGNoX3Jldmlld2VyLCAncmV2aWV3ZXInKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAg ICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ3t9IGlzIGEgdmFsaWQgcmV2aWV3ZXIuXG4n LmZvcm1hdChwYXRjaF9yZXZpZXdlcikpCisgICAgICAgIHNlbGYuZmluaXNoZWQoU1VDQ0VTUykK KyAgICAgICAgcmV0dXJuIE5vbmUKKworCiBjbGFzcyBWYWxpZGF0ZUNoYW5nZUxvZ0FuZFJldmll d2VyKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgbmFtZSA9ICd2YWxpZGF0ZS1jaGFuZ2Vsb2ct YW5kLXJldmlld2VyJwogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnVmFsaWRhdGVkIENoYW5nZUxv ZyBhbmQgUmV2aWV3ZXInXQo= 391692 2020-02-25 15:28:32 -0800 2020-02-26 09:44:23 -0800 Patch bug-206532-20200225182831.patch text/plain 5302 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NzM3NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTAyLTI1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIHZlcmlmeSBwYXRjaCBjb21t aXR0ZXIgYW5kIHJldmlld2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDY1MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAg ICAgKFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlcik6IEJ1aWxkIHN0ZXAgdG8gdmFsaWRhdGUg cGF0Y2ggY29tbWl0ZXIgYW5kIHJldmlld2VyLgorICAgICAgICAoVmFsaWRhdGVDb21taXRlckFu ZFJldmlld2VyLl9hZGRUb0xvZyk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZ2V0UmVzdWx0U3VtbWFyeSk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZmFpbF9idWlsZCk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIubG9h ZF9jb250cmlidXRvcnMpOiBMb2FkIGNvbnRyaWJ1dG9ycyBpbmZvcm1hdGlvbi4KKyAgICAgICAg KFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlci5pc19yZXZpZXdlcik6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuaXNfY29tbWl0dGVyKToKKyAgICAgICAgKFZhbGlkYXRl Q29tbWl0ZXJBbmRSZXZpZXdlci5mdWxsX25hbWVfZnJvbV9lbWFpbCk6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuc3RhcnQpOgorCiAyMDIwLTAyLTI1ICBEYW5pZWwgQmF0 ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXN0V2ViS2l0QVBJLlBhc3RlTWl4 ZWRDb250ZW50LkNvcHlBbmRQYXN0ZVdpdGhDdXN0b21QYXN0ZWJvYXJkRGF0YU9ubHkgc2hvdWxk IHdhaXQgdW50aWwgY29weSBvcGVyYXRpb24gY29tcGxldGVzCkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNTczODMpCisrKyBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAg LTYxNCw2ICs2MTQsOTMgQEAgY2xhc3MgVmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVw LAogICAgICAgICByZXR1cm4gTm9uZQogCiAKK2NsYXNzIFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZp ZXdlcihidWlsZHN0ZXAuQnVpbGRTdGVwKToKKyAgICBuYW1lID0gJ3ZhbGlkYXRlLWNvbW1pdGVy LWFuZC1yZXZpZXdlcicKKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ1ZhbGlkYXRlZCBjb21taXRl ciBhbmQgcmV2aWV3ZXInXQorICAgIHVybCA9ICdodHRwczovL3RyYWMud2Via2l0Lm9yZy9icm93 c2VyL3dlYmtpdC90cnVuay9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29u dHJpYnV0b3JzLmpzb24nCisgICAgdXJsX3RleHQgPSAne30/Zm9ybWF0PXR4dCcuZm9ybWF0KHVy bCkKKyAgICBjb250cmlidXRvcnMgPSB7fQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAg ICAgICBidWlsZHN0ZXAuQnVpbGRTdGVwLl9faW5pdF9fKHNlbGYpCisgICAgICAgIHNlbGYubG9h ZF9jb250cmlidXRvcnMoKQorCisgICAgQGRlZmVyLmlubGluZUNhbGxiYWNrcworICAgIGRlZiBf YWRkVG9Mb2coc2VsZiwgbG9nTmFtZSwgbWVzc2FnZSk6CisgICAgICAgIHRyeToKKyAgICAgICAg ICAgIGxvZyA9IHNlbGYuZ2V0TG9nKGxvZ05hbWUpCisgICAgICAgIGV4Y2VwdCBLZXlFcnJvcjoK KyAgICAgICAgICAgIGxvZyA9IHlpZWxkIHNlbGYuYWRkTG9nKGxvZ05hbWUpCisgICAgICAgIGxv Zy5hZGRTdGRvdXQobWVzc2FnZSkKKworICAgIGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgor ICAgICAgICBpZiBzZWxmLnJlc3VsdHMgPT0gRkFJTFVSRToKKyAgICAgICAgICAgIHJldHVybiB7 dSdzdGVwJzogdW5pY29kZShzZWxmLmRlc2NyaXB0aW9uRG9uZSl9CisgICAgICAgIHJldHVybiBi dWlsZHN0ZXAuQnVpbGRTdGVwLmdldFJlc3VsdFN1bW1hcnkoc2VsZikKKworICAgIGRlZiBmYWls X2J1aWxkKHNlbGYsIGVtYWlsLCBzdGF0dXMpOgorICAgICAgICByZWFzb24gPSAne30gZG9lcyBu b3QgaGF2ZSB7fSBwZXJtaXNzaW9ucycuZm9ybWF0KGVtYWlsLCBzdGF0dXMpCisgICAgICAgIGNv bW1lbnQgPSAne30gZG9lcyBub3QgaGF2ZSB7fSBwZXJtaXNzaW9ucyBhY2NvcmRpbmcgdG8ge30u Jy5mb3JtYXQoZW1haWwsIHN0YXR1cywgc2VsZi51cmwpCisgICAgICAgIGNvbW1lbnQgKz0gJ1xu XG5SZWplY3RpbmcgYXR0YWNobWVudCB7fSBmcm9tIGNvbW1pdCBxdWV1ZS4nLmZvcm1hdChzZWxm LmdldFByb3BlcnR5KCdwYXRjaF9pZCcsICcnKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgn YnVnemlsbGFfY29tbWVudF90ZXh0JywgY29tbWVudCkKKworICAgICAgICBzZWxmLl9hZGRUb0xv Zygnc3RkaW8nLCByZWFzb24pCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkX2Zpbmlz aF9zdW1tYXJ5JywgcmVhc29uKQorICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJy ZW50U3RlcChbQ29tbWVudE9uQnVnKCksIFNldENvbW1pdFF1ZXVlTWludXNGbGFnT25QYXRjaCgp XSkKKyAgICAgICAgc2VsZi5maW5pc2hlZChGQUlMVVJFKQorICAgICAgICBzZWxmLmRlc2NyaXB0 aW9uRG9uZSA9IHJlYXNvbgorCisgICAgZGVmIGxvYWRfY29udHJpYnV0b3JzKHNlbGYpOgorICAg ICAgICBpZiBzZWxmLmNvbnRyaWJ1dG9yczoKKyAgICAgICAgICAgIHJldHVybiBzZWxmLmNvbnRy aWJ1dG9ycworICAgICAgICBzZWxmLmNvbnRyaWJ1dG9ycyA9IHt9CisgICAgICAgIHJlc3BvbnNl ID0gcmVxdWVzdHMuZ2V0KHNlbGYudXJsX3RleHQpCisgICAgICAgIGlmIChub3QgcmVzcG9uc2Up IG9yIChyZXNwb25zZS5zdGF0dXNfY29kZSAhPSAyMDApOgorICAgICAgICAgICAgcmV0dXJuIHt9 CisgICAgICAgIGNvbnRyaWJ1dG9ycyA9IHJlc3BvbnNlLmpzb24oKQorICAgICAgICBmb3Iga2V5 LCB2YWx1ZSBpbiBjb250cmlidXRvcnMuaXRlcml0ZW1zKCk6CisgICAgICAgICAgICBlbWFpbHMg PSB2YWx1ZS5nZXQoJ2VtYWlscycpCisgICAgICAgICAgICBmb3IgZW1haWwgaW4gZW1haWxzOgor ICAgICAgICAgICAgICAgIHNlbGYuY29udHJpYnV0b3JzW2VtYWlsXSA9IHsnbmFtZSc6IGtleSwg J3N0YXR1cyc6IHZhbHVlLmdldCgnc3RhdHVzJyl9CisgICAgICAgIHJldHVybiBzZWxmLmNvbnRy aWJ1dG9ycworCisgICAgZGVmIGlzX3Jldmlld2VyKHNlbGYsIGVtYWlsKToKKyAgICAgICAgY29u dHJpYnV0b3IgPSBzZWxmLmNvbnRyaWJ1dG9ycy5nZXQoZW1haWwpCisgICAgICAgIHJldHVybiBj b250cmlidXRvciBhbmQgY29udHJpYnV0b3JbJ3N0YXR1cyddID09ICdyZXZpZXdlcicKKworICAg IGRlZiBpc19jb21taXR0ZXIoc2VsZiwgZW1haWwpOgorICAgICAgICBjb250cmlidXRvciA9IHNl bGYuY29udHJpYnV0b3JzLmdldChlbWFpbCkKKyAgICAgICAgcmV0dXJuIGNvbnRyaWJ1dG9yIGFu ZCBjb250cmlidXRvclsnc3RhdHVzJ10gaW4gWydyZXZpZXdlcicsICdjb21taXR0ZXInXQorCisg ICAgZGVmIGZ1bGxfbmFtZV9mcm9tX2VtYWlsKHNlbGYsIGVtYWlsKToKKyAgICAgICAgY29udHJp YnV0b3IgPSBzZWxmLmNvbnRyaWJ1dG9ycy5nZXQoZW1haWwpCisgICAgICAgIGlmIG5vdCBjb250 cmlidXRvcjoKKyAgICAgICAgICAgIHJldHVybiAnJworICAgICAgICByZXR1cm4gY29udHJpYnV0 b3IuZ2V0KCduYW1lJykKKworICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgcGF0Y2hfY29t bWl0dGVyID0gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hfY29tbWl0dGVyJywgJycpCisgICAgICAg IGlmIG5vdCBzZWxmLmlzX2NvbW1pdHRlcihwYXRjaF9jb21taXR0ZXIpOgorICAgICAgICAgICAg c2VsZi5mYWlsX2J1aWxkKHBhdGNoX2NvbW1pdHRlciwgJ2NvbW1pdHRlcicpCisgICAgICAgICAg ICByZXR1cm4gTm9uZQorICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAne30gaXMgYSB2 YWxpZCBjb21taXRlci5cbicuZm9ybWF0KHBhdGNoX2NvbW1pdHRlcikpCisKKyAgICAgICAgcGF0 Y2hfcmV2aWV3ZXIgPSBzZWxmLmdldFByb3BlcnR5KCdwYXRjaF9yZXZpZXdlcicsICcnKQorICAg ICAgICBpZiBub3QgcGF0Y2hfcmV2aWV3ZXI6CisgICAgICAgICAgICAjIFBhdGNoIGRvZXMgbm90 IGhhdmUgcisgZmxhZy4gVGhpcyBpcyBhY2NlcHRhYmxlLCBzaW5jZSB0aGUgQ2hhbmdlTG9nIG1p Z2h0IGhhdmUgJ1Jldmlld2VkIGJ5JyBpbiBpdC4KKyAgICAgICAgICAgIHNlbGYuZGVzY3JpcHRp b25Eb25lID0gJ1ZhbGlkYXRlZCBjb21taXR0ZXInCisgICAgICAgICAgICBzZWxmLmZpbmlzaGVk KFNVQ0NFU1MpCisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoJ3BhdGNoX3Jldmlld2VyX2Z1bGxfbmFtZScsIHNlbGYuZnVsbF9uYW1lX2Zyb21fZW1h aWwocGF0Y2hfcmV2aWV3ZXIpKQorICAgICAgICBpZiBub3Qgc2VsZi5pc19yZXZpZXdlcihwYXRj aF9yZXZpZXdlcik6CisgICAgICAgICAgICBzZWxmLmZhaWxfYnVpbGQocGF0Y2hfcmV2aWV3ZXIs ICdyZXZpZXdlcicpCisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICBzZWxmLl9hZGRU b0xvZygnc3RkaW8nLCAne30gaXMgYSB2YWxpZCByZXZpZXdlci5cbicuZm9ybWF0KHBhdGNoX3Jl dmlld2VyKSkKKyAgICAgICAgc2VsZi5maW5pc2hlZChTVUNDRVNTKQorICAgICAgICByZXR1cm4g Tm9uZQorCisKIGNsYXNzIFZhbGlkYXRlQ2hhbmdlTG9nQW5kUmV2aWV3ZXIoc2hlbGwuU2hlbGxD b21tYW5kKToKICAgICBuYW1lID0gJ3ZhbGlkYXRlLWNoYW5nZWxvZy1hbmQtcmV2aWV3ZXInCiAg ICAgZGVzY3JpcHRpb25Eb25lID0gWydWYWxpZGF0ZWQgQ2hhbmdlTG9nIGFuZCBSZXZpZXdlcidd Cg== 391751 2020-02-26 09:44:26 -0800 2020-02-26 10:50:46 -0800 Patch bug-206532-20200226124425.patch text/plain 5573 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NzM3NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTAyLTI1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIHZlcmlmeSBwYXRjaCBjb21t aXR0ZXIgYW5kIHJldmlld2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDY1MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAg ICAgKFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlcik6IEJ1aWxkIHN0ZXAgdG8gdmFsaWRhdGUg cGF0Y2ggY29tbWl0ZXIgYW5kIHJldmlld2VyLgorICAgICAgICAoVmFsaWRhdGVDb21taXRlckFu ZFJldmlld2VyLl9hZGRUb0xvZyk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZ2V0UmVzdWx0U3VtbWFyeSk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZmFpbF9idWlsZCk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIubG9h ZF9jb250cmlidXRvcnMpOiBMb2FkIGNvbnRyaWJ1dG9ycyBpbmZvcm1hdGlvbi4KKyAgICAgICAg KFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlci5pc19yZXZpZXdlcik6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuaXNfY29tbWl0dGVyKToKKyAgICAgICAgKFZhbGlkYXRl Q29tbWl0ZXJBbmRSZXZpZXdlci5mdWxsX25hbWVfZnJvbV9lbWFpbCk6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuc3RhcnQpOgorCiAyMDIwLTAyLTI1ICBEYW5pZWwgQmF0 ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXN0V2ViS2l0QVBJLlBhc3RlTWl4 ZWRDb250ZW50LkNvcHlBbmRQYXN0ZVdpdGhDdXN0b21QYXN0ZWJvYXJkRGF0YU9ubHkgc2hvdWxk IHdhaXQgdW50aWwgY29weSBvcGVyYXRpb24gY29tcGxldGVzCkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNTczODMpCisrKyBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAg LTYxNCw2ICs2MTQsOTggQEAgY2xhc3MgVmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVw LAogICAgICAgICByZXR1cm4gTm9uZQogCiAKK2NsYXNzIFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZp ZXdlcihidWlsZHN0ZXAuQnVpbGRTdGVwKToKKyAgICBuYW1lID0gJ3ZhbGlkYXRlLWNvbW1pdGVy LWFuZC1yZXZpZXdlcicKKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ1ZhbGlkYXRlZCBjb21taXRl ciBhbmQgcmV2aWV3ZXInXQorICAgIHVybCA9ICdodHRwczovL3RyYWMud2Via2l0Lm9yZy9icm93 c2VyL3dlYmtpdC90cnVuay9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29u dHJpYnV0b3JzLmpzb24nCisgICAgdXJsX3RleHQgPSAne30/Zm9ybWF0PXR4dCcuZm9ybWF0KHVy bCkKKyAgICBjb250cmlidXRvcnMgPSB7fQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAg ICAgICBidWlsZHN0ZXAuQnVpbGRTdGVwLl9faW5pdF9fKHNlbGYpCisgICAgICAgIGlmIG5vdCBz ZWxmLmNvbnRyaWJ1dG9yczoKKyAgICAgICAgICAgIHNlbGYuY29udHJpYnV0b3JzID0gc2VsZi5s b2FkX2NvbnRyaWJ1dG9ycygpCisKKyAgICBAZGVmZXIuaW5saW5lQ2FsbGJhY2tzCisgICAgZGVm IF9hZGRUb0xvZyhzZWxmLCBsb2dOYW1lLCBtZXNzYWdlKToKKyAgICAgICAgdHJ5OgorICAgICAg ICAgICAgbG9nID0gc2VsZi5nZXRMb2cobG9nTmFtZSkKKyAgICAgICAgZXhjZXB0IEtleUVycm9y OgorICAgICAgICAgICAgbG9nID0geWllbGQgc2VsZi5hZGRMb2cobG9nTmFtZSkKKyAgICAgICAg bG9nLmFkZFN0ZG91dChtZXNzYWdlKQorCisgICAgZGVmIGdldFJlc3VsdFN1bW1hcnkoc2VsZik6 CisgICAgICAgIGlmIHNlbGYucmVzdWx0cyA9PSBGQUlMVVJFOgorICAgICAgICAgICAgcmV0dXJu IHt1J3N0ZXAnOiB1bmljb2RlKHNlbGYuZGVzY3JpcHRpb25Eb25lKX0KKyAgICAgICAgcmV0dXJu IGJ1aWxkc3RlcC5CdWlsZFN0ZXAuZ2V0UmVzdWx0U3VtbWFyeShzZWxmKQorCisgICAgZGVmIGZh aWxfYnVpbGQoc2VsZiwgZW1haWwsIHN0YXR1cyk6CisgICAgICAgIHJlYXNvbiA9ICd7fSBkb2Vz IG5vdCBoYXZlIHt9IHBlcm1pc3Npb25zLicuZm9ybWF0KGVtYWlsLCBzdGF0dXMpCisgICAgICAg IGNvbW1lbnQgPSAne30gZG9lcyBub3QgaGF2ZSB7fSBwZXJtaXNzaW9ucyBhY2NvcmRpbmcgdG8g e30uJy5mb3JtYXQoZW1haWwsIHN0YXR1cywgc2VsZi51cmwpCisgICAgICAgIGNvbW1lbnQgKz0g J1xuXG5SZWplY3RpbmcgYXR0YWNobWVudCB7fSBmcm9tIGNvbW1pdCBxdWV1ZS4nLmZvcm1hdChz ZWxmLmdldFByb3BlcnR5KCdwYXRjaF9pZCcsICcnKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgnYnVnemlsbGFfY29tbWVudF90ZXh0JywgY29tbWVudCkKKworICAgICAgICBzZWxmLl9hZGRU b0xvZygnc3RkaW8nLCByZWFzb24pCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkX2Zp bmlzaF9zdW1tYXJ5JywgcmVhc29uKQorICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJD dXJyZW50U3RlcChbQ29tbWVudE9uQnVnKCksIFNldENvbW1pdFF1ZXVlTWludXNGbGFnT25QYXRj aCgpXSkKKyAgICAgICAgc2VsZi5maW5pc2hlZChGQUlMVVJFKQorICAgICAgICBzZWxmLmRlc2Ny aXB0aW9uRG9uZSA9IHJlYXNvbgorCisgICAgZGVmIGxvYWRfY29udHJpYnV0b3JzKHNlbGYpOgor ICAgICAgICB0cnk6CisgICAgICAgICAgICByZXNwb25zZSA9IHJlcXVlc3RzLmdldChzZWxmLnVy bF90ZXh0KQorICAgICAgICAgICAgaWYgcmVzcG9uc2Uuc3RhdHVzX2NvZGUgIT0gMjAwOgorICAg ICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdGYWlsZWQgdG8gYWNjZXNzIHt9 IHdpdGggc3RhdHVzIGNvZGU6IHt9XG4nLmZvcm1hdChzZWxmLnVybF90ZXh0LCByZXNwb25zZS5z dGF0dXNfY29kZSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHt9CisgICAgICAgIGV4Y2VwdCBF eGNlcHRpb24gYXMgZToKKyAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdGYWls ZWQgdG8gYWNjZXNzIHt1cmx9XG4nLmZvcm1hdCh1cmw9c2VsZi51cmxfdGV4dCkpCisgICAgICAg ICAgICByZXR1cm4ge30KKworICAgICAgICBjb250cmlidXRvcnNfanNvbiA9IHJlc3BvbnNlLmpz b24oKQorICAgICAgICBjb250cmlidXRvcnMgPSB7fQorICAgICAgICBmb3Iga2V5LCB2YWx1ZSBp biBjb250cmlidXRvcnNfanNvbi5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgIGVtYWlscyA9IHZh bHVlLmdldCgnZW1haWxzJykKKyAgICAgICAgICAgIGZvciBlbWFpbCBpbiBlbWFpbHM6CisgICAg ICAgICAgICAgICAgY29udHJpYnV0b3JzW2VtYWlsXSA9IHsnbmFtZSc6IGtleSwgJ3N0YXR1cyc6 IHZhbHVlLmdldCgnc3RhdHVzJyl9CisgICAgICAgIHJldHVybiBjb250cmlidXRvcnMKKworICAg IGRlZiBpc19yZXZpZXdlcihzZWxmLCBlbWFpbCk6CisgICAgICAgIGNvbnRyaWJ1dG9yID0gc2Vs Zi5jb250cmlidXRvcnMuZ2V0KGVtYWlsKQorICAgICAgICByZXR1cm4gY29udHJpYnV0b3IgYW5k IGNvbnRyaWJ1dG9yWydzdGF0dXMnXSA9PSAncmV2aWV3ZXInCisKKyAgICBkZWYgaXNfY29tbWl0 dGVyKHNlbGYsIGVtYWlsKToKKyAgICAgICAgY29udHJpYnV0b3IgPSBzZWxmLmNvbnRyaWJ1dG9y cy5nZXQoZW1haWwpCisgICAgICAgIHJldHVybiBjb250cmlidXRvciBhbmQgY29udHJpYnV0b3Jb J3N0YXR1cyddIGluIFsncmV2aWV3ZXInLCAnY29tbWl0dGVyJ10KKworICAgIGRlZiBmdWxsX25h bWVfZnJvbV9lbWFpbChzZWxmLCBlbWFpbCk6CisgICAgICAgIGNvbnRyaWJ1dG9yID0gc2VsZi5j b250cmlidXRvcnMuZ2V0KGVtYWlsKQorICAgICAgICBpZiBub3QgY29udHJpYnV0b3I6CisgICAg ICAgICAgICByZXR1cm4gJycKKyAgICAgICAgcmV0dXJuIGNvbnRyaWJ1dG9yLmdldCgnbmFtZScp CisKKyAgICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAgIHBhdGNoX2NvbW1pdHRlciA9IHNlbGYu Z2V0UHJvcGVydHkoJ3BhdGNoX2NvbW1pdHRlcicsICcnKQorICAgICAgICBpZiBub3Qgc2VsZi5p c19jb21taXR0ZXIocGF0Y2hfY29tbWl0dGVyKToKKyAgICAgICAgICAgIHNlbGYuZmFpbF9idWls ZChwYXRjaF9jb21taXR0ZXIsICdjb21taXR0ZXInKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUK KyAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ3t9IGlzIGEgdmFsaWQgY29tbWl0ZXIu XG4nLmZvcm1hdChwYXRjaF9jb21taXR0ZXIpKQorCisgICAgICAgIHBhdGNoX3Jldmlld2VyID0g c2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hfcmV2aWV3ZXInLCAnJykKKyAgICAgICAgaWYgbm90IHBh dGNoX3Jldmlld2VyOgorICAgICAgICAgICAgIyBQYXRjaCBkb2VzIG5vdCBoYXZlIHIrIGZsYWcu IFRoaXMgaXMgYWNjZXB0YWJsZSwgc2luY2UgdGhlIENoYW5nZUxvZyBtaWdodCBoYXZlICdSZXZp ZXdlZCBieScgaW4gaXQuCisgICAgICAgICAgICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9ICdWYWxp ZGF0ZWQgY29tbWl0dGVyJworICAgICAgICAgICAgc2VsZi5maW5pc2hlZChTVUNDRVNTKQorICAg ICAgICAgICAgcmV0dXJuIE5vbmUKKworICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9y ZXZpZXdlcl9mdWxsX25hbWUnLCBzZWxmLmZ1bGxfbmFtZV9mcm9tX2VtYWlsKHBhdGNoX3Jldmll d2VyKSkKKyAgICAgICAgaWYgbm90IHNlbGYuaXNfcmV2aWV3ZXIocGF0Y2hfcmV2aWV3ZXIpOgor ICAgICAgICAgICAgc2VsZi5mYWlsX2J1aWxkKHBhdGNoX3Jldmlld2VyLCAncmV2aWV3ZXInKQor ICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywg J3t9IGlzIGEgdmFsaWQgcmV2aWV3ZXIuXG4nLmZvcm1hdChwYXRjaF9yZXZpZXdlcikpCisgICAg ICAgIHNlbGYuZmluaXNoZWQoU1VDQ0VTUykKKyAgICAgICAgcmV0dXJuIE5vbmUKKworCiBjbGFz cyBWYWxpZGF0ZUNoYW5nZUxvZ0FuZFJldmlld2VyKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAg bmFtZSA9ICd2YWxpZGF0ZS1jaGFuZ2Vsb2ctYW5kLXJldmlld2VyJwogICAgIGRlc2NyaXB0aW9u RG9uZSA9IFsnVmFsaWRhdGVkIENoYW5nZUxvZyBhbmQgUmV2aWV3ZXInXQo= 391755 2020-02-26 10:50:49 -0800 2020-02-26 11:22:43 -0800 Patch bug-206532-20200226135048.patch text/plain 5689 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NzQ4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTAyLTI2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIHZlcmlmeSBwYXRjaCBjb21t aXR0ZXIgYW5kIHJldmlld2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDY1MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAg ICAgKFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlcik6IEJ1aWxkIHN0ZXAgdG8gdmFsaWRhdGUg cGF0Y2ggY29tbWl0ZXIgYW5kIHJldmlld2VyLgorICAgICAgICAoVmFsaWRhdGVDb21taXRlckFu ZFJldmlld2VyLl9hZGRUb0xvZyk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZ2V0UmVzdWx0U3VtbWFyeSk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3 ZXIuZmFpbF9idWlsZCk6CisgICAgICAgIChWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIubG9h ZF9jb250cmlidXRvcnMpOiBMb2FkIGNvbnRyaWJ1dG9ycyBpbmZvcm1hdGlvbi4KKyAgICAgICAg KFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlci5pc19yZXZpZXdlcik6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuaXNfY29tbWl0dGVyKToKKyAgICAgICAgKFZhbGlkYXRl Q29tbWl0ZXJBbmRSZXZpZXdlci5mdWxsX25hbWVfZnJvbV9lbWFpbCk6CisgICAgICAgIChWYWxp ZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIuc3RhcnQpOgorCiAyMDIwLTAyLTI2ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZGlzYWJsZSBuZXcg RHJhZ0FuZERyb3BUZXN0cy5EcmFnQW5kRHJvcE9uRW1wdHlWaWV3IEFQSSB0ZXN0IG9uIGlPUy4K SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlz aW9uIDI1NzQ4MSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQkod29ya2luZyBjb3B5KQpAQCAtNjE0LDYgKzYxNCw5OSBAQCBjbGFzcyBWYWxpZGF0ZVBhdGNo KGJ1aWxkc3RlcC5CdWlsZFN0ZXAsCiAgICAgICAgIHJldHVybiBOb25lCiAKIAorY2xhc3MgVmFs aWRhdGVDb21taXRlckFuZFJldmlld2VyKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgorICAgIG5hbWUg PSAndmFsaWRhdGUtY29tbWl0ZXItYW5kLXJldmlld2VyJworICAgIGRlc2NyaXB0aW9uRG9uZSA9 IFsnVmFsaWRhdGVkIGNvbW1pdGVyIGFuZCByZXZpZXdlciddCisgICAgdXJsID0gJ2h0dHBzOi8v dHJhYy53ZWJraXQub3JnL2Jyb3dzZXIvd2Via2l0L3RydW5rL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbicKKyAgICB1cmxfdGV4dCA9ICd7fT9m b3JtYXQ9dHh0Jy5mb3JtYXQodXJsKQorICAgIGNvbnRyaWJ1dG9ycyA9IHt9CisKKyAgICBkZWYg bG9hZF9jb250cmlidXRvcnMoc2VsZik6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJlc3Bv bnNlID0gcmVxdWVzdHMuZ2V0KHNlbGYudXJsX3RleHQpCisgICAgICAgICAgICBpZiByZXNwb25z ZS5zdGF0dXNfY29kZSAhPSAyMDA6CisgICAgICAgICAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0 ZGlvJywgJ0ZhaWxlZCB0byBhY2Nlc3Mge30gd2l0aCBzdGF0dXMgY29kZToge31cbicuZm9ybWF0 KHNlbGYudXJsX3RleHQsIHJlc3BvbnNlLnN0YXR1c19jb2RlKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4ge30KKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgorICAgICAgICAgICAgc2Vs Zi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ0ZhaWxlZCB0byBhY2Nlc3Mge3VybH1cbicuZm9ybWF0KHVy bD1zZWxmLnVybF90ZXh0KSkKKyAgICAgICAgICAgIHJldHVybiB7fQorCisgICAgICAgIGNvbnRy aWJ1dG9yc19qc29uID0gcmVzcG9uc2UuanNvbigpCisgICAgICAgIGNvbnRyaWJ1dG9ycyA9IHt9 CisgICAgICAgIGZvciBrZXksIHZhbHVlIGluIGNvbnRyaWJ1dG9yc19qc29uLml0ZXJpdGVtcygp OgorICAgICAgICAgICAgZW1haWxzID0gdmFsdWUuZ2V0KCdlbWFpbHMnKQorICAgICAgICAgICAg Zm9yIGVtYWlsIGluIGVtYWlsczoKKyAgICAgICAgICAgICAgICBjb250cmlidXRvcnNbZW1haWxd ID0geyduYW1lJzoga2V5LCAnc3RhdHVzJzogdmFsdWUuZ2V0KCdzdGF0dXMnKX0KKyAgICAgICAg cmV0dXJuIGNvbnRyaWJ1dG9ycworCisgICAgQGRlZmVyLmlubGluZUNhbGxiYWNrcworICAgIGRl ZiBfYWRkVG9Mb2coc2VsZiwgbG9nTmFtZSwgbWVzc2FnZSk6CisgICAgICAgIHRyeToKKyAgICAg ICAgICAgIGxvZyA9IHNlbGYuZ2V0TG9nKGxvZ05hbWUpCisgICAgICAgIGV4Y2VwdCBLZXlFcnJv cjoKKyAgICAgICAgICAgIGxvZyA9IHlpZWxkIHNlbGYuYWRkTG9nKGxvZ05hbWUpCisgICAgICAg IGxvZy5hZGRTdGRvdXQobWVzc2FnZSkKKworICAgIGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYp OgorICAgICAgICBpZiBzZWxmLnJlc3VsdHMgPT0gRkFJTFVSRToKKyAgICAgICAgICAgIHJldHVy biB7dSdzdGVwJzogdW5pY29kZShzZWxmLmRlc2NyaXB0aW9uRG9uZSl9CisgICAgICAgIHJldHVy biBidWlsZHN0ZXAuQnVpbGRTdGVwLmdldFJlc3VsdFN1bW1hcnkoc2VsZikKKworICAgIGRlZiBm YWlsX2J1aWxkKHNlbGYsIGVtYWlsLCBzdGF0dXMpOgorICAgICAgICByZWFzb24gPSAne30gZG9l cyBub3QgaGF2ZSB7fSBwZXJtaXNzaW9ucycuZm9ybWF0KGVtYWlsLCBzdGF0dXMpCisgICAgICAg IGNvbW1lbnQgPSAne30gZG9lcyBub3QgaGF2ZSB7fSBwZXJtaXNzaW9ucyBhY2NvcmRpbmcgdG8g e30uJy5mb3JtYXQoZW1haWwsIHN0YXR1cywgc2VsZi51cmwpCisgICAgICAgIGNvbW1lbnQgKz0g J1xuXG5SZWplY3RpbmcgYXR0YWNobWVudCB7fSBmcm9tIGNvbW1pdCBxdWV1ZS4nLmZvcm1hdChz ZWxmLmdldFByb3BlcnR5KCdwYXRjaF9pZCcsICcnKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgnYnVnemlsbGFfY29tbWVudF90ZXh0JywgY29tbWVudCkKKworICAgICAgICBzZWxmLl9hZGRU b0xvZygnc3RkaW8nLCByZWFzb24pCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkX2Zp bmlzaF9zdW1tYXJ5JywgcmVhc29uKQorICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJD dXJyZW50U3RlcChbQ29tbWVudE9uQnVnKCksIFNldENvbW1pdFF1ZXVlTWludXNGbGFnT25QYXRj aCgpXSkKKyAgICAgICAgc2VsZi5maW5pc2hlZChGQUlMVVJFKQorICAgICAgICBzZWxmLmRlc2Ny aXB0aW9uRG9uZSA9IHJlYXNvbgorCisgICAgZGVmIGlzX3Jldmlld2VyKHNlbGYsIGVtYWlsKToK KyAgICAgICAgY29udHJpYnV0b3IgPSBzZWxmLmNvbnRyaWJ1dG9ycy5nZXQoZW1haWwpCisgICAg ICAgIHJldHVybiBjb250cmlidXRvciBhbmQgY29udHJpYnV0b3JbJ3N0YXR1cyddID09ICdyZXZp ZXdlcicKKworICAgIGRlZiBpc19jb21taXR0ZXIoc2VsZiwgZW1haWwpOgorICAgICAgICBjb250 cmlidXRvciA9IHNlbGYuY29udHJpYnV0b3JzLmdldChlbWFpbCkKKyAgICAgICAgcmV0dXJuIGNv bnRyaWJ1dG9yIGFuZCBjb250cmlidXRvclsnc3RhdHVzJ10gaW4gWydyZXZpZXdlcicsICdjb21t aXR0ZXInXQorCisgICAgZGVmIGZ1bGxfbmFtZV9mcm9tX2VtYWlsKHNlbGYsIGVtYWlsKToKKyAg ICAgICAgY29udHJpYnV0b3IgPSBzZWxmLmNvbnRyaWJ1dG9ycy5nZXQoZW1haWwpCisgICAgICAg IGlmIG5vdCBjb250cmlidXRvcjoKKyAgICAgICAgICAgIHJldHVybiAnJworICAgICAgICByZXR1 cm4gY29udHJpYnV0b3IuZ2V0KCduYW1lJykKKworICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAg ICAgc2VsZi5jb250cmlidXRvcnMgPSBzZWxmLmxvYWRfY29udHJpYnV0b3JzKCkKKyAgICAgICAg aWYgbm90IHNlbGYuY29udHJpYnV0b3JzOgorICAgICAgICAgICAgc2VsZi5maW5pc2hlZChGQUlM VVJFKQorICAgICAgICAgICAgc2VsZi5kZXNjcmlwdGlvbkRvbmUgPSAnRmFpbGVkIHRvIGdldCBj b250cmlidXRvcnMgaW5mb3JtYXRpb24nCisgICAgICAgICAgICBzZWxmLmJ1aWxkLmJ1aWxkRmlu aXNoZWQoWydGYWlsZWQgdG8gZ2V0IGNvbnRyaWJ1dG9ycyBpbmZvcm1hdGlvbiddLCBGQUlMVVJF KQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAgcGF0Y2hfY29tbWl0dGVyID0gc2Vs Zi5nZXRQcm9wZXJ0eSgncGF0Y2hfY29tbWl0dGVyJywgJycpCisgICAgICAgIGlmIG5vdCBzZWxm LmlzX2NvbW1pdHRlcihwYXRjaF9jb21taXR0ZXIpOgorICAgICAgICAgICAgc2VsZi5mYWlsX2J1 aWxkKHBhdGNoX2NvbW1pdHRlciwgJ2NvbW1pdHRlcicpCisgICAgICAgICAgICByZXR1cm4gTm9u ZQorICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAne30gaXMgYSB2YWxpZCBjb21taXRl ci5cbicuZm9ybWF0KHBhdGNoX2NvbW1pdHRlcikpCisKKyAgICAgICAgcGF0Y2hfcmV2aWV3ZXIg PSBzZWxmLmdldFByb3BlcnR5KCdwYXRjaF9yZXZpZXdlcicsICcnKQorICAgICAgICBpZiBub3Qg cGF0Y2hfcmV2aWV3ZXI6CisgICAgICAgICAgICAjIFBhdGNoIGRvZXMgbm90IGhhdmUgcisgZmxh Zy4gVGhpcyBpcyBhY2NlcHRhYmxlLCBzaW5jZSB0aGUgQ2hhbmdlTG9nIG1pZ2h0IGhhdmUgJ1Jl dmlld2VkIGJ5JyBpbiBpdC4KKyAgICAgICAgICAgIHNlbGYuZGVzY3JpcHRpb25Eb25lID0gJ1Zh bGlkYXRlZCBjb21taXR0ZXInCisgICAgICAgICAgICBzZWxmLmZpbmlzaGVkKFNVQ0NFU1MpCisg ICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNo X3Jldmlld2VyX2Z1bGxfbmFtZScsIHNlbGYuZnVsbF9uYW1lX2Zyb21fZW1haWwocGF0Y2hfcmV2 aWV3ZXIpKQorICAgICAgICBpZiBub3Qgc2VsZi5pc19yZXZpZXdlcihwYXRjaF9yZXZpZXdlcik6 CisgICAgICAgICAgICBzZWxmLmZhaWxfYnVpbGQocGF0Y2hfcmV2aWV3ZXIsICdyZXZpZXdlcicp CisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8n LCAne30gaXMgYSB2YWxpZCByZXZpZXdlci5cbicuZm9ybWF0KHBhdGNoX3Jldmlld2VyKSkKKyAg ICAgICAgc2VsZi5maW5pc2hlZChTVUNDRVNTKQorICAgICAgICByZXR1cm4gTm9uZQorCisKIGNs YXNzIFZhbGlkYXRlQ2hhbmdlTG9nQW5kUmV2aWV3ZXIoc2hlbGwuU2hlbGxDb21tYW5kKToKICAg ICBuYW1lID0gJ3ZhbGlkYXRlLWNoYW5nZWxvZy1hbmQtcmV2aWV3ZXInCiAgICAgZGVzY3JpcHRp b25Eb25lID0gWydWYWxpZGF0ZWQgQ2hhbmdlTG9nIGFuZCBSZXZpZXdlciddCg==