171121 2017-04-21 10:51:24 -0700 obsolete_attachment should not fail when flags do not exist 2020-02-03 15:32:17 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 olivier.blin ashvayka aakash_jain ap ashvayka buildbot commit-queue dbates ews-watchlist glenn jbedard lforschler webkit-bug-importer oldest_to_newest 1299692 0 olivier.blin 2017-04-21 10:51:24 -0700 ./Tools/Scripts/webkit-patch upload 113124 -g HEAD Total errors found: 0 in 5 files Was that diff correct? [Y/n]: Please enter password for encrypted keyring: Logging in as olivier.blin@softathome.com... Fetching: https://bugs.webkit.org/show_bug.cgi?id=113124&ctype=xml&excludefield=attachmentdata Obsoleting 1 old patch on bug 113124 Obsoleting attachment: 195692 "webkit-patch upload" fails in obsolete_attachment when review/commit-queue flags do not exist. This occurred on https://bugs.webkit.org/attachment.cgi?id=195692&action=edit ./Tools/Scripts/webkit-patch upload 113124 -g HEAD Total errors found: 0 in 5 files Was that diff correct? [Y/n]: Please enter password for encrypted keyring: Logging in as olivier.blin@softathome.com... Fetching: https://bugs.webkit.org/show_bug.cgi?id=113124&ctype=xml&excludefield=attachmentdata Obsoleting 1 old patch on bug 113124 Obsoleting attachment: 195692 Traceback (most recent call last): File "./Tools/Scripts/webkit-patch", line 84, in <module> main() File "./Tools/Scripts/webkit-patch", line 79, in main WebKitPatch(os.path.abspath(__file__)).main() File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 305, in main result = command.check_arguments_and_execute(options, args, self) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 123, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 55, in execute self._sequence.run_and_handle_errors(tool, options, state) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 73, in run_and_handle_errors self._run(tool, options, state) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 67, in _run step(tool, options).run(state) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/tool/steps/obsoletepatches.py", line 54, in run self._tool.bugs.obsolete_attachment(patch.id()) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py", line 790, in obsolete_attachment self._find_select_element_for_flag('review').value = ("X",) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py", line 735, in _find_select_element_for_flag return self.browser.find_control(type='select', nr=0) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_form.py", line 3101, in find_control return self._find_control(name, type, kind, id, label, predicate, nr) File "/home/sah0146/vc/webkit.org/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_form.py", line 3185, in _find_control raise ControlNotFoundError("no control matching "+description) webkitpy.thirdparty.autoinstalled.mechanize._form.ControlNotFoundError: no control matching type 'select' 1299693 1 olivier.blin 2017-04-21 10:53:13 -0700 Oops, sorry for the incorrect first lines of the first comment, description should start with: "webkit-patch upload" fails in obsolete_attachment when review/commit-queue flags do not exist. This occurred on https://bugs.webkit.org/attachment.cgi?id=195692&action=edit 1299697 2 307752 olivier.blin 2017-04-21 10:55:30 -0700 Created attachment 307752 Patch 1299954 3 307752 olivier.blin 2017-04-21 15:47:20 -0700 Comment on attachment 307752 Patch >- self._find_select_element_for_flag('review').value = ("X",) >- self._find_select_element_for_flag('commit-queue').value = ("X",) >+ try: >+ self._find_select_element_for_flag('review').value = ("X",) >+ self._find_select_element_for_flag('commit-queue').value = ("X",) >+ except: >+ pass Actually, maybe it would be better to have one try/catch per flag, if only one of these select is present on the attachment details page. 1300011 4 ap 2017-04-21 17:12:41 -0700 It's not clear to me when this happens. Is this when the contributor doesn't have the EditBugs permission? Otherwise, I think that these inputs are always present. 1300349 5 olivier.blin 2017-04-23 12:10:49 -0700 (In reply to Alexey Proskuryakov from comment #4) > It's not clear to me when this happens. Is this when the contributor doesn't > have the EditBugs permission? Otherwise, I think that these inputs are > always present. Not sure about the exact cause, I have submitted a few patches before, and never got this issue before. This happened on old bug 113124 from 2013, where the patch did not show any flags in the details page. See https://bugs.webkit.org/attachment.cgi?id=195692&action=edit It has not been obsoleted either actually. 1614114 6 389555 ashvayka 2020-02-03 13:31:35 -0800 Created attachment 389555 Patch 1614146 7 389555 jbedard 2020-02-03 14:03:04 -0800 Comment on attachment 389555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389555&action=review > Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py:-627 > - # FIXME: Should this use self._find_select_element_for_flag? I don't think we should address these FIXMEs in this change, I would prefer that be another patch. Although, the fixes themselves seem fine. > Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py:849 > +Ignore this message if you don't have EditBugs privileges (https://bugs.webkit.org/userprefs.cgi?tab=permissions)""") I would actually prefer this in two separate log statements rather than breaking indentation. 1614166 8 389568 ashvayka 2020-02-03 14:28:19 -0800 Created attachment 389568 Patch 1614185 9 ashvayka 2020-02-03 14:47:32 -0800 (In reply to Olivier Blin from comment #3) > Actually, maybe it would be better to have one try/catch per flag, if only > one of these select is present on the attachment details page. To my observation, both <select>s are present and disabled for unprivileged users. I was hoping to avoid try/catch by checking whether "isobsolete" checkbox is present, but no luck: it is there, but hidden. (In reply to Alexey Shvayka from comment #8) > Created attachment 389568 [details] > Patch Remove FIXME-related changes, extract NO_EDIT_BUGS_MESSAGE, and use ValueError. 1614186 10 389568 jbedard 2020-02-03 14:48:08 -0800 Comment on attachment 389568 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389568&action=review > Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py:915 > + _log.warning(self.NO_EDIT_BUGS_MESSAGE) Good catch! 1614220 11 389568 commit-queue 2020-02-03 15:31:36 -0800 Comment on attachment 389568 Patch Clearing flags on attachment: 389568 Committed r255605: <https://trac.webkit.org/changeset/255605> 1614221 12 commit-queue 2020-02-03 15:31:38 -0800 All reviewed patches have been landed. Closing bug. 1614223 13 webkit-bug-importer 2020-02-03 15:32:17 -0800 <rdar://problem/59128683> 307752 2017-04-21 10:55:30 -0700 2020-02-03 13:31:29 -0800 Patch bug-171121-20170421195529.patch text/plain 1999 olivier.blin U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NjExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjU2MTc1OWJmNGNkNjQ2NWY3YjJjNmQzOGU1YzcyYTM0 ZTQ3MDRiMC4uY2E2ZDNkYmQzMTMzY2MzYmViMzUzZjc4ZDVhODgxZWY2YWNmMzM5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE3LTA0LTIxICBPbGl2aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5j b20+CisKKyAgICAgICAgb2Jzb2xldGVfYXR0YWNobWVudCBzaG91bGQgbm90IGZhaWwgd2hlbiBm bGFncyBkbyBub3QgZXhpc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MTEyMQorCisgICAgICAgICJ3ZWJraXQtcGF0Y2ggdXBsb2FkIiBmYWlscyBp biBvYnNvbGV0ZV9hdHRhY2htZW50IHdoZW4gcmV2aWV3L2NvbW1pdC1xdWV1ZSBmbGFncyBkbyBu b3QgZXhpc3QuCisKKyAgICAgICAgVGhpcyBvY2N1cnJlZCBvbiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9hdHRhY2htZW50LmNnaT9pZD0xOTU2OTImYWN0aW9uPWVkaXQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weToKKyAgICAgICAgKEJ1Z3ppbGxhLm9ic29sZXRl X2F0dGFjaG1lbnQpOiBkbyBub3QgY3Jhc2ggd2hlbiByZXZpZXcvY29tbWl0LXF1ZXVlIGZsYWdz IGRvIG5vdCBleGlzdAorCiAyMDE3LTA0LTIxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVkdWNlIGNvcGllcyBhbmQgYWxsb2NhdGlvbnMg aW4gU2hhcmVkQnVmZmVyOjphcHBlbmQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQppbmRleCBkMWU2YjY5OGMxMjk2NWRi ODViZjcyYTNkNjI2NDUyMjg0Yjg2ODRkLi4xNDcwZmMzN2FmZWM0MDA5ZjgyZDU3Mjc5ZTJlOTJm ODkwMDVlZDY2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQv YnVnemlsbGEvYnVnemlsbGEucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v bmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CkBAIC03ODQsOCArNzg0LDExIEBAIGNsYXNzIEJ1Z3pp bGxhKG9iamVjdCk6CiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9ybShucj0xKQogICAg ICAgICBzZWxmLmJyb3dzZXIuZmluZF9jb250cm9sKCdpc29ic29sZXRlJykuaXRlbXNbMF0uc2Vs ZWN0ZWQgPSBUcnVlCiAgICAgICAgICMgQWxzbyBjbGVhciBhbnkgcmV2aWV3IGZsYWcgKHRvIHJl bW92ZSBpdCBmcm9tIHJldmlldy9jb21taXQgcXVldWVzKQotICAgICAgICBzZWxmLl9maW5kX3Nl bGVjdF9lbGVtZW50X2Zvcl9mbGFnKCdyZXZpZXcnKS52YWx1ZSA9ICgiWCIsKQotICAgICAgICBz ZWxmLl9maW5kX3NlbGVjdF9lbGVtZW50X2Zvcl9mbGFnKCdjb21taXQtcXVldWUnKS52YWx1ZSA9 ICgiWCIsKQorICAgICAgICB0cnk6CisgICAgICAgICAgICBzZWxmLl9maW5kX3NlbGVjdF9lbGVt ZW50X2Zvcl9mbGFnKCdyZXZpZXcnKS52YWx1ZSA9ICgiWCIsKQorICAgICAgICAgICAgc2VsZi5f ZmluZF9zZWxlY3RfZWxlbWVudF9mb3JfZmxhZygnY29tbWl0LXF1ZXVlJykudmFsdWUgPSAoIlgi LCkKKyAgICAgICAgZXhjZXB0OgorICAgICAgICAgICAgcGFzcwogICAgICAgICBpZiBjb21tZW50 X3RleHQ6CiAgICAgICAgICAgICBfbG9nLmluZm8oY29tbWVudF90ZXh0KQogICAgICAgICAgICAg IyBCdWd6aWxsYSBoYXMgdHdvIHRleHRhcmVhcyBuYW1lZCAnY29tbWVudCcsIG9uZSBpcyBzb21l aG93Cg== 389555 2020-02-03 13:31:35 -0800 2020-02-03 14:28:16 -0800 Patch bug-171121-20200203233134.patch text/plain 4826 ashvayka U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NTU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzkxMjIxYWI1ZGZmMWQyYmJkOWY1NWJiNGQ0ZjNiNjlk NGFkYTAyZi4uMjBkNjY3OGRiYTY0OGU0NDFhMDdiZDA2NTQ4N2NkNzg0MWUwZjdhZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIwLTAyLTAzICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4K KworICAgICAgICBvYnNvbGV0ZV9hdHRhY2htZW50IHNob3VsZCBub3QgZmFpbCB3aGVuIGZsYWdz IGRvIG5vdCBleGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTcxMTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQmVmb3JlIHRoaXMgY2hhbmdlLCBhbiBlcnJvciBvY2N1cmVkIGlmIGEgY29udHJpYnV0 b3Igd2l0aG91dCBFZGl0QnVncyBwcml2aWxlZ2VzIHRyaWVkCisgICAgICAgIHRvIG9ic29sZXRl IG5vdCB0aGVpciBvd24gYXR0YWNobWVudC4gV2l0aCB0aGlzIHBhdGNoLCB1cGxvYWRpbmcgcm91 dGluZSBjb250aW51ZXMgd2l0aAorICAgICAgICBmcmllbmRseSBjb25zb2xlIHdhcm5pbmcgbGlr ZSB3ZSBoYXZlIGluIHJlYXNzaWduX2J1ZygpIG1ldGhvZC4KKworICAgICAgICBBbHNvLCAyIEZJ WE1FcyBhcmUgcmVzb2x2ZWQ6CisgICAgICAgIDEuIF9maW5kX3NlbGVjdF9lbGVtZW50X2Zvcl9m bGFnKCkgaXMgbm93IHVzZWQgaW4gX2ZpbGxfYXR0YWNobWVudF9mb3JtKCkgbWV0aG9kLgorICAg ICAgICAyLiBfZmluZF9zZWxlY3RfZWxlbWVudF9mb3JfZmxhZygpIG5vdyBkb2VzIG5vdCByZWx5 IG9uIG9yZGVyIG9mIDxzZWxlY3Q+IGVsZW1lbnRzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5OgorICAgICAgICAoQnVnemlsbGEu X2ZpbGxfYXR0YWNobWVudF9mb3JtKToKKyAgICAgICAgKEJ1Z3ppbGxhLl9maW5kX3NlbGVjdF9l bGVtZW50X2Zvcl9mbGFnKToKKyAgICAgICAgKEJ1Z3ppbGxhLm9ic29sZXRlX2F0dGFjaG1lbnQp OgorCiAyMDIwLTAyLTAzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAog ICAgICAgICBVc2Ugc3RkOjpoeXBvdCgpIHdoZXJlIHBvc3NpYmxlCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXgg NDFjOWUxZThlODAzYzBlMWNkMmI2NjcyYmVjYzViY2MyZmY1YjRlOS4uMDc3ZDA5MDc2OWU0YjZk NGUxNmMyYWIyMmViZGMxZmJlOGMxMTNjMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQpAQCAtNTEsNiArNTEsNyBA QCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQuY3JlZGVudGlhbHMgaW1wb3J0IENyZWRlbnRpYWxz CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQubmV0d29ya3RyYW5zYWN0aW9uIGltcG9ydCBOZXR3 b3JrVHJhbnNhY3Rpb24KIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS51c2VyIGltcG9ydCBV c2VyCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuQmVhdXRpZnVsU291cCBpbXBvcnQgQmVhdXRp ZnVsU291cCwgQmVhdXRpZnVsU3RvbmVTb3VwLCBTb3VwU3RyYWluZXIKK2Zyb20gd2Via2l0cHku dGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLm1lY2hhbml6ZS5fZm9ybV9jb250cm9scyBpbXBvcnQg Q29udHJvbE5vdEZvdW5kRXJyb3IKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9f KQogCkBAIC02MjQsOSArNjI1LDggQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0KToKICAgICAgICAg c2VsZi5icm93c2VyWydkZXNjcmlwdGlvbiddID0gZGVzY3JpcHRpb24KICAgICAgICAgaWYgaXNf cGF0Y2g6CiAgICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ2lzcGF0Y2gnXSA9ICgiMSIsKQotICAg ICAgICAjIEZJWE1FOiBTaG91bGQgdGhpcyB1c2Ugc2VsZi5fZmluZF9zZWxlY3RfZWxlbWVudF9m b3JfZmxhZz8KLSAgICAgICAgc2VsZi5icm93c2VyWydmbGFnX3R5cGUtMSddID0gKCc/JywpIGlm IG1hcmtfZm9yX3JldmlldyBlbHNlICgnWCcsKQotICAgICAgICBzZWxmLmJyb3dzZXJbJ2ZsYWdf dHlwZS0zJ10gPSAoc2VsZi5fY29tbWl0X3F1ZXVlX2ZsYWcoY29tbWl0X2ZsYWcpLCkKKyAgICAg ICAgc2VsZi5fZmluZF9zZWxlY3RfZWxlbWVudF9mb3JfZmxhZygicmV2aWV3IikudmFsdWUgPSAo Ij8iLCkgaWYgbWFya19mb3JfcmV2aWV3IGVsc2UgKCJYIiwpCisgICAgICAgIHNlbGYuX2ZpbmRf c2VsZWN0X2VsZW1lbnRfZm9yX2ZsYWcoImNvbW1pdC1xdWV1ZSIpLnZhbHVlID0gKHNlbGYuX2Nv bW1pdF9xdWV1ZV9mbGFnKGNvbW1pdF9mbGFnKSwpCiAKICAgICAgICAgZmlsZW5hbWUgPSBmaWxl bmFtZSBvciAiJXMucGF0Y2giICUgdGltZXN0YW1wKCkKICAgICAgICAgaWYgbm90IG1pbWV0eXBl OgpAQCAtNzgyLDEyICs3ODIsMTYgQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0KToKICAgICAgICAg cmV0dXJuIGJ1Z19pZAogCiAgICAgZGVmIF9maW5kX3NlbGVjdF9lbGVtZW50X2Zvcl9mbGFnKHNl bGYsIGZsYWdfbmFtZSk6Ci0gICAgICAgICMgRklYTUU6IFRoaXMgd2lsbCBicmVhayBpZiB3ZSBl dmVyIHJlLW9yZGVyIGF0dGFjaG1lbnQgZmxhZ3MKICAgICAgICAgaWYgZmxhZ19uYW1lID09ICJy ZXZpZXciOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYuYnJvd3Nlci5maW5kX2NvbnRyb2wodHlw ZT0nc2VsZWN0JywgbnI9MCkKKyAgICAgICAgICAgIGNsYXNzX25hbWUgPSAiZmxhZ190eXBlLTEi CiAgICAgICAgIGVsaWYgZmxhZ19uYW1lID09ICJjb21taXQtcXVldWUiOgotICAgICAgICAgICAg cmV0dXJuIHNlbGYuYnJvd3Nlci5maW5kX2NvbnRyb2wodHlwZT0nc2VsZWN0JywgbnI9MSkKLSAg ICAgICAgcmFpc2UgRXhjZXB0aW9uKCJEb24ndCBrbm93IGhvdyB0byBmaW5kIGZsYWcgbmFtZWQg XCIlc1wiIiAlIGZsYWdfbmFtZSkKKyAgICAgICAgICAgIGNsYXNzX25hbWUgPSAiZmxhZ190eXBl LTMiCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oIkRvbid0IGtu b3cgaG93IHRvIGZpbmQgZmxhZyBuYW1lZCBcIiVzXCIiICUgZmxhZ19uYW1lKQorCisgICAgICAg IHJldHVybiBzZWxmLmJyb3dzZXIuZmluZF9jb250cm9sKAorICAgICAgICAgICAgdHlwZT0ic2Vs ZWN0IiwKKyAgICAgICAgICAgIHByZWRpY2F0ZT1sYW1iZGEgY29udHJvbDogY2xhc3NfbmFtZSBp biAoY29udHJvbC5hdHRycy5nZXQoImNsYXNzIikgb3IgIiIpKQogCiAgICAgZGVmIGNsZWFyX2F0 dGFjaG1lbnRfZmxhZ3Moc2VsZiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdHRh Y2htZW50X2lkLApAQCAtODM0LDEwICs4MzgsMTYgQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0KToK ICAgICAgICAgX2xvZy5pbmZvKCJPYnNvbGV0aW5nIGF0dGFjaG1lbnQ6ICVzIiAlIGF0dGFjaG1l bnRfaWQpCiAgICAgICAgIHNlbGYub3Blbl91cmwoc2VsZi5hdHRhY2htZW50X3VybF9mb3JfaWQo YXR0YWNobWVudF9pZCwgJ2VkaXQnKSkKICAgICAgICAgc2VsZi5icm93c2VyLnNlbGVjdF9mb3Jt KG5yPTEpCi0gICAgICAgIHNlbGYuYnJvd3Nlci5maW5kX2NvbnRyb2woJ2lzb2Jzb2xldGUnKS5p dGVtc1swXS5zZWxlY3RlZCA9IFRydWUKLSAgICAgICAgIyBBbHNvIGNsZWFyIGFueSByZXZpZXcg ZmxhZyAodG8gcmVtb3ZlIGl0IGZyb20gcmV2aWV3L2NvbW1pdCBxdWV1ZXMpCi0gICAgICAgIHNl bGYuX2ZpbmRfc2VsZWN0X2VsZW1lbnRfZm9yX2ZsYWcoJ3JldmlldycpLnZhbHVlID0gKCJYIiwp Ci0gICAgICAgIHNlbGYuX2ZpbmRfc2VsZWN0X2VsZW1lbnRfZm9yX2ZsYWcoJ2NvbW1pdC1xdWV1 ZScpLnZhbHVlID0gKCJYIiwpCisKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5icm93 c2VyLmZpbmRfY29udHJvbCgiaXNvYnNvbGV0ZSIpLml0ZW1zWzBdLnNlbGVjdGVkID0gVHJ1ZQor ICAgICAgICAgICAgIyBBbHNvIGNsZWFyIGFueSByZXZpZXcgZmxhZyAodG8gcmVtb3ZlIGl0IGZy b20gcmV2aWV3L2NvbW1pdCBxdWV1ZXMpCisgICAgICAgICAgICBzZWxmLl9maW5kX3NlbGVjdF9l bGVtZW50X2Zvcl9mbGFnKCJyZXZpZXciKS52YWx1ZSA9ICgiWCIsKQorICAgICAgICAgICAgc2Vs Zi5fZmluZF9zZWxlY3RfZWxlbWVudF9mb3JfZmxhZygiY29tbWl0LXF1ZXVlIikudmFsdWUgPSAo IlgiLCkKKyAgICAgICAgZXhjZXB0IChBdHRyaWJ1dGVFcnJvciwgQ29udHJvbE5vdEZvdW5kRXJy b3IpOgorICAgICAgICAgICAgX2xvZy53YXJuaW5nKCIiIkZhaWxlZCB0byBvYnNvbGV0ZSBhdHRh Y2htZW50LgorSWdub3JlIHRoaXMgbWVzc2FnZSBpZiB5b3UgZG9uJ3QgaGF2ZSBFZGl0QnVncyBw cml2aWxlZ2VzIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy91c2VycHJlZnMuY2dpP3RhYj1wZXJt aXNzaW9ucykiIiIpCisKICAgICAgICAgaWYgY29tbWVudF90ZXh0OgogICAgICAgICAgICAgX2xv Zy5pbmZvKGNvbW1lbnRfdGV4dCkKICAgICAgICAgICAgICMgQnVnemlsbGEgaGFzIHR3byB0ZXh0 YXJlYXMgbmFtZWQgJ2NvbW1lbnQnLCBvbmUgaXMgc29tZWhvdwo= 389568 2020-02-03 14:28:19 -0800 2020-02-03 15:31:36 -0800 Patch bug-171121-20200204002818.patch text/plain 3436 ashvayka U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NTU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzkxMjIxYWI1ZGZmMWQyYmJkOWY1NWJiNGQ0ZjNiNjlk NGFkYTAyZi4uNDMwYThiM2Y4NWY4NWZkMzQ1Mzk3ZTFhOGFmMWZhZDM0YjFlNWQ3MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIwLTAyLTAzICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4K KworICAgICAgICBvYnNvbGV0ZV9hdHRhY2htZW50IHNob3VsZCBub3QgZmFpbCB3aGVuIGZsYWdz IGRvIG5vdCBleGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTcxMTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQmVmb3JlIHRoaXMgY2hhbmdlLCBhbiBlcnJvciBvY2N1cmVkIGlmIGEgY29udHJpYnV0 b3Igd2l0aG91dCBFZGl0QnVncyBwcml2aWxlZ2VzIHRyaWVkCisgICAgICAgIHRvIG9ic29sZXRl IG5vdCB0aGVpciBvd24gYXR0YWNobWVudC4gV2l0aCB0aGlzIHBhdGNoLCB1cGxvYWRpbmcgcm91 dGluZSBjb250aW51ZXMgd2l0aAorICAgICAgICBmcmllbmRseSBjb25zb2xlIHdhcm5pbmcgbGlr ZSB3ZSBoYXZlIGluIHJlYXNzaWduX2J1ZygpIG1ldGhvZC4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weToKKyAgICAgICAgKEJ1Z3pp bGxhKToKKyAgICAgICAgKEJ1Z3ppbGxhLm9ic29sZXRlX2F0dGFjaG1lbnQpOgorICAgICAgICAo QnVnemlsbGEucmVhc3NpZ25fYnVnKTogVXNlIE5PX0VESVRfQlVHU19NRVNTQUdFIGNvbnN0YW50 LgorCiAyMDIwLTAyLTAzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAog ICAgICAgICBVc2Ugc3RkOjpoeXBvdCgpIHdoZXJlIHBvc3NpYmxlCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXgg NDFjOWUxZThlODAzYzBlMWNkMmI2NjcyYmVjYzViY2MyZmY1YjRlOS4uMGNiNjdhODM0YjFiYzBi ZjAxZGEyYWNmOWMxMTc0OTdjMjRjZTE2YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQpAQCAtMzA4LDYgKzMwOCw4 IEBAIGNsYXNzIENvbW1pdFF1ZXVlRmxhZyhvYmplY3QpOgogCiAKIGNsYXNzIEJ1Z3ppbGxhKG9i amVjdCk6CisgICAgTk9fRURJVF9CVUdTX01FU1NBR0UgPSAiSWdub3JlIHRoaXMgbWVzc2FnZSBp ZiB5b3UgZG9uJ3QgaGF2ZSBFZGl0QnVncyBwcml2aWxlZ2VzIChodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy91c2VycHJlZnMuY2dpP3RhYj1wZXJtaXNzaW9ucykiCisKICAgICBkZWYgX19pbml0X18o c2VsZiwgY29tbWl0dGVycz1jb21taXR0ZXJzLkNvbW1pdHRlckxpc3QoKSk6CiAgICAgICAgIHNl bGYuYXV0aGVudGljYXRlZCA9IEZhbHNlCiAgICAgICAgIHNlbGYucXVlcmllcyA9IEJ1Z3ppbGxh UXVlcmllcyhzZWxmKQpAQCAtODM0LDEwICs4MzYsMTYgQEAgY2xhc3MgQnVnemlsbGEob2JqZWN0 KToKICAgICAgICAgX2xvZy5pbmZvKCJPYnNvbGV0aW5nIGF0dGFjaG1lbnQ6ICVzIiAlIGF0dGFj aG1lbnRfaWQpCiAgICAgICAgIHNlbGYub3Blbl91cmwoc2VsZi5hdHRhY2htZW50X3VybF9mb3Jf aWQoYXR0YWNobWVudF9pZCwgJ2VkaXQnKSkKICAgICAgICAgc2VsZi5icm93c2VyLnNlbGVjdF9m b3JtKG5yPTEpCi0gICAgICAgIHNlbGYuYnJvd3Nlci5maW5kX2NvbnRyb2woJ2lzb2Jzb2xldGUn KS5pdGVtc1swXS5zZWxlY3RlZCA9IFRydWUKLSAgICAgICAgIyBBbHNvIGNsZWFyIGFueSByZXZp ZXcgZmxhZyAodG8gcmVtb3ZlIGl0IGZyb20gcmV2aWV3L2NvbW1pdCBxdWV1ZXMpCi0gICAgICAg IHNlbGYuX2ZpbmRfc2VsZWN0X2VsZW1lbnRfZm9yX2ZsYWcoJ3JldmlldycpLnZhbHVlID0gKCJY IiwpCi0gICAgICAgIHNlbGYuX2ZpbmRfc2VsZWN0X2VsZW1lbnRfZm9yX2ZsYWcoJ2NvbW1pdC1x dWV1ZScpLnZhbHVlID0gKCJYIiwpCisKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5i cm93c2VyLmZpbmRfY29udHJvbCgiaXNvYnNvbGV0ZSIpLml0ZW1zWzBdLnNlbGVjdGVkID0gVHJ1 ZQorICAgICAgICAgICAgIyBBbHNvIGNsZWFyIGFueSByZXZpZXcgZmxhZyAodG8gcmVtb3ZlIGl0 IGZyb20gcmV2aWV3L2NvbW1pdCBxdWV1ZXMpCisgICAgICAgICAgICBzZWxmLl9maW5kX3NlbGVj dF9lbGVtZW50X2Zvcl9mbGFnKCJyZXZpZXciKS52YWx1ZSA9ICgiWCIsKQorICAgICAgICAgICAg c2VsZi5fZmluZF9zZWxlY3RfZWxlbWVudF9mb3JfZmxhZygiY29tbWl0LXF1ZXVlIikudmFsdWUg PSAoIlgiLCkKKyAgICAgICAgZXhjZXB0IChBdHRyaWJ1dGVFcnJvciwgVmFsdWVFcnJvcik6Cisg ICAgICAgICAgICBfbG9nLndhcm5pbmcoIkZhaWxlZCB0byBvYnNvbGV0ZSBhdHRhY2htZW50IikK KyAgICAgICAgICAgIF9sb2cud2FybmluZyhzZWxmLk5PX0VESVRfQlVHU19NRVNTQUdFKQorCiAg ICAgICAgIGlmIGNvbW1lbnRfdGV4dDoKICAgICAgICAgICAgIF9sb2cuaW5mbyhjb21tZW50X3Rl eHQpCiAgICAgICAgICAgICAjIEJ1Z3ppbGxhIGhhcyB0d28gdGV4dGFyZWFzIG5hbWVkICdjb21t ZW50Jywgb25lIGlzIHNvbWVob3cKQEAgLTkwMyw4ICs5MTEsOCBAQCBjbGFzcyBCdWd6aWxsYShv YmplY3QpOgogICAgICAgICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zvcm0obmFtZT0iY2hhbmdlZm9y bSIpCiAKICAgICAgICAgaWYgbm90IHNlbGYuX2hhc19jb250cm9sKHNlbGYuYnJvd3NlciwgImFz c2lnbmVkX3RvIik6Ci0gICAgICAgICAgICBfbG9nLndhcm5pbmcoIiIiRmFpbGVkIHRvIGFzc2ln biBidWcgdG8geW91IChjYW4ndCBmaW5kIGFzc2lnbmVkX3RvKSBjb250cm9sLgotSWdub3JlIHRo aXMgbWVzc2FnZSBpZiB5b3UgZG9uJ3QgaGF2ZSBFZGl0QnVncyBwcml2aWxlZ2VzIChodHRwczov L2J1Z3Mud2Via2l0Lm9yZy91c2VycHJlZnMuY2dpP3RhYj1wZXJtaXNzaW9ucykiIiIpCisgICAg ICAgICAgICBfbG9nLndhcm5pbmcoIkZhaWxlZCB0byBhc3NpZ24gYnVnIHRvIHlvdSAoY2FuJ3Qg ZmluZCBhc3NpZ25lZF90bykgY29udHJvbC4iKQorICAgICAgICAgICAgX2xvZy53YXJuaW5nKHNl bGYuTk9fRURJVF9CVUdTX01FU1NBR0UpCiAgICAgICAgICAgICByZXR1cm4KIAogICAgICAgICBp ZiBjb21tZW50X3RleHQ6Cg==