From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#37891: [PATCH] Clean up error on wrong major mode in package-menu-mode Date: Wed, 23 Oct 2019 18:09:21 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000007f944d05959624fe" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="18767"; mail-complaints-to="usenet@blaine.gmane.org" To: 37891@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 23 19:20:49 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iNKJV-0004m5-GP for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Oct 2019 19:20:49 +0200 Original-Received: from localhost ([::1]:42334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNKJU-0002aH-7S for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Oct 2019 13:20:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46258) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNJD1-00036O-K6 for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2019 12:10:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNJD0-0003zx-LN for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2019 12:10:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54277) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNJD0-0003zr-Hx for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2019 12:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iNJD0-0003cD-Bc for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2019 12:10:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 23 Oct 2019 16:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37891 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.157184697913854 (code B ref -1); Wed, 23 Oct 2019 16:10:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Oct 2019 16:09:39 +0000 Original-Received: from localhost ([127.0.0.1]:34865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iNJCc-0003bN-LV for submit@debbugs.gnu.org; Wed, 23 Oct 2019 12:09:38 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:52449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iNJCb-0003bH-Vx for submit@debbugs.gnu.org; Wed, 23 Oct 2019 12:09:38 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46151) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNJCa-0002QB-Au for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2019 12:09:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNJCZ-0003m7-8d for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2019 12:09:36 -0400 Original-Received: from mail-pl1-f171.google.com ([209.85.214.171]:34858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNJCZ-0003lr-0K for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2019 12:09:35 -0400 Original-Received: by mail-pl1-f171.google.com with SMTP id c3so10317334plo.2 for ; Wed, 23 Oct 2019 09:09:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=L1Xb4KzqPBox4V0bRCNYsnUx3UHQ9kUfiMDwrIil0lA=; b=ldpMsusvy/FV87FrWDoEQgObMU7Ebm02wVtFDi1y4QOOBevs5ZxSosT2AqvCH5xUEw szlNl38cBecPL+iBsRPkuFep/JMWV2iBpm9G++pelH/kc4mTCREKs6YUJybRIjkUDdkK tIKCbuUV8OzYsTevThoVDrpX1zwe/9/bCoOMF9duytIHjuuntkwrX6tZMcsabit2CSRk eP2qNq10yA3/R62Y4RkEmpUawyCes6U+PJ1EOeBjl3Q+iljXt3axtOOkHfEAH71Jp3o4 SV1r6mbF38HGISyFjEN7f2O8hQheLt6k3v7PykOupFBYZ8BwD3y5TqEQ3XcUutRDqa9E uwSw== X-Gm-Message-State: APjAAAU0MMQ163bP4PltkK1X1VcIIR3CMBfF7EHlPZ5smMP9BvNxBkyB DvvqfTpPssEZUcg2d8LhB+Y2fsaDK48LSLGVe2wGFQ== X-Google-Smtp-Source: APXvYqxuaHLKEM7xNXYqjQu+RGOEhppUbrEZhAHvOiWhjmQubE/Z4InsdAw0eJFwQ0996PW3RXVgdGyNEetY0drD/ro= X-Received: by 2002:a17:902:a98c:: with SMTP id bh12mr10835027plb.128.1571846973516; Wed, 23 Oct 2019 09:09:33 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:170083 Archived-At: --0000000000007f944d05959624fe Content-Type: text/plain; charset="UTF-8" Four package-menu-mode specific commands currently signal an error if called when not in package-menu-mode. One of them uses 'user-error', the others 'error'. All other commands don't signal an error. The attached patch makes the behaviour more consistent by: 1) Factoring out the error signalling into a new function to make it more consistent. 2) Calling this function in all other relevant package-mode-menu commands. Any comments? Best regards, Stefan Kangas --0000000000007f944d05959624fe Content-Type: application/octet-stream; name="0001-Clean-up-error-on-wrong-major-mode-in-package-menu-m.patch" Content-Disposition: attachment; filename="0001-Clean-up-error-on-wrong-major-mode-in-package-menu-m.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k23h3g3r0 RnJvbSBjYjcyNTUxYWNmZGQyN2FhZTRlMmVhYWRiNDNjMDc0ZDk2NmRkNDU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t PgpEYXRlOiBXZWQsIDIzIE9jdCAyMDE5IDE3OjQ2OjI5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g Q2xlYW4gdXAgZXJyb3Igb24gd3JvbmcgbWFqb3IgbW9kZSBpbiBwYWNrYWdlLW1lbnUtbW9kZQoK KiBsaXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbCAocGFja2FnZS0tZW5zdXJlLXBhY2thZ2UtbWVu dS1tb2RlKToKRXh0cmFjdCBmdW5jdGlvbiB0byB3YXJuIGFib3V0IGluY29ycmVjdCBtYWpvciBt b2RlLi4uCihwYWNrYWdlLW1lbnUtdG9nZ2xlLWhpZGluZywgcGFja2FnZS1tZW51LXJlZnJlc2gp CihwYWNrYWdlLW1lbnUtZXhlY3V0ZSk6IC4uLmZyb20gaGVyZS4KKHBhY2thZ2UtbWVudS0tbWFy ay11cGdyYWRlcy0xKTogQW5kIGhlcmUsIGJ1dCBtb3ZlIGNhbGwuLi4KKHBhY2thZ2UtbWVudS1t YXJrLXVwZ3JhZGVzKTogLi4uaGVyZSBpbnN0ZWFkLgoocGFja2FnZS1tZW51LWhpZGUtcGFja2Fn ZSwgcGFja2FnZS1tZW51LW1hcmstZGVsZXRlKQoocGFja2FnZS1tZW51LW1hcmstaW5zdGFsbCwg cGFja2FnZS1tZW51LW1hcmstdW5tYXJrKQoocGFja2FnZS1tZW51LXF1aWNrLWhlbHAsIHBhY2th Z2UtbWVudS1nZXQtc3RhdHVzKQoocGFja2FnZS1tZW51LWZpbHRlci1ieS1rZXl3b3JkLCBwYWNr YWdlLW1lbnUtZmlsdGVyLWJ5LW5hbWUpCihwYWNrYWdlLW1lbnUtY2xlYXItZmlsdGVyKTogQWRk IGNhbGwgdG8gbmV3IGZ1bmN0aW9uLgotLS0KIGxpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLmVsIHwg MjggKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIwIGluc2Vy dGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lbWFjcy1saXNwL3Bh Y2thZ2UuZWwgYi9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbAppbmRleCA2NDVlODMxYmNjLi4y ZGEzYjQ2MWVmIDEwMDY0NAotLS0gYS9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbAorKysgYi9s aXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbApAQCAtMjc4Myw2ICsyNzgzLDExIEBAIHBhY2thZ2Ut bGlzdC11bnNpZ25lZAogKGRlZnZhciBwYWNrYWdlLS1lbWFjcy12ZXJzaW9uLWxpc3QgKHZlcnNp b24tdG8tbGlzdCBlbWFjcy12ZXJzaW9uKQogICAiVGhlIHZhbHVlIG9mIHZhcmlhYmxlIGBlbWFj cy12ZXJzaW9uJyBhcyBhIGxpc3QuIikKIAorKGRlZnVuIHBhY2thZ2UtLWVuc3VyZS1wYWNrYWdl LW1lbnUtbW9kZSAoKQorICAiU2lnbmFsIGEgdXNlci1lcnJvciBpZiBtYWpvciBtb2RlIGlzIG5v dCBgcGFja2FnZS1tZW51LW1vZGUnLiIKKyAgKHVubGVzcyAoZGVyaXZlZC1tb2RlLXAgJ3BhY2th Z2UtbWVudS1tb2RlKQorICAgICh1c2VyLWVycm9yICJUaGUgY3VycmVudCBidWZmZXIgaXMgbm90 IGEgUGFja2FnZSBNZW51IikpKQorCiAoZGVmdW4gcGFja2FnZS0taW5jb21wYXRpYmxlLXAgKHBr ZyAmb3B0aW9uYWwgc2hhbGxvdykKICAgIlJldHVybiBub24tbmlsIGlmIFBLRyBoYXMgbm8gY2hh bmNlIG9mIGJlaW5nIGluc3RhbGxhYmxlLgogUEtHIGlzIGEgYHBhY2thZ2UtZGVzYycgb2JqZWN0 LgpAQCAtMjg1OCw4ICsyODYzLDcgQEAgcGFja2FnZS1tZW51LS1oaWRlLXBhY2thZ2VzCiAoZGVm dW4gcGFja2FnZS1tZW51LXRvZ2dsZS1oaWRpbmcgKCkKICAgIkluIFBhY2thZ2UgTWVudSwgdG9n Z2xlIHZpc2liaWxpdHkgb2Ygb2Jzb2xldGUgYXZhaWxhYmxlIHBhY2thZ2VzLiIKICAgKGludGVy YWN0aXZlKQotICAodW5sZXNzIChkZXJpdmVkLW1vZGUtcCAncGFja2FnZS1tZW51LW1vZGUpCi0g ICAgKHVzZXItZXJyb3IgIlRoZSBjdXJyZW50IGJ1ZmZlciBpcyBub3QgYSBQYWNrYWdlIE1lbnUi KSkKKyAgKHBhY2thZ2UtLWVuc3VyZS1wYWNrYWdlLW1lbnUtbW9kZSkKICAgKHNldHEgcGFja2Fn ZS1tZW51LS1oaWRlLXBhY2thZ2VzCiAgICAgICAgIChub3QgcGFja2FnZS1tZW51LS1oaWRlLXBh Y2thZ2VzKSkKICAgKGlmIHBhY2thZ2UtbWVudS0taGlkZS1wYWNrYWdlcwpAQCAtMzE2NCw4ICsz MTY4LDcgQEAgcGFja2FnZS1tZW51LXJlZnJlc2gKIGBwYWNrYWdlLWFyY2hpdmVzJywgYW5kIHRo ZW4gcmVmcmVzaCB0aGUgcGFja2FnZSBtZW51LiAgU2lnbmFsIGEKIHVzZXItZXJyb3IgaWYgdGhl cmUgaXMgYWxyZWFkeSBhIHJlZnJlc2ggcnVubmluZyBhc3luY2hyb25vdXNseS4iCiAgIChpbnRl cmFjdGl2ZSkKLSAgKHVubGVzcyAoZGVyaXZlZC1tb2RlLXAgJ3BhY2thZ2UtbWVudS1tb2RlKQot ICAgICh1c2VyLWVycm9yICJUaGUgY3VycmVudCBidWZmZXIgaXMgbm90IGEgUGFja2FnZSBNZW51 IikpCisgIChwYWNrYWdlLS1lbnN1cmUtcGFja2FnZS1tZW51LW1vZGUpCiAgICh3aGVuIChhbmQg cGFja2FnZS1tZW51LWFzeW5jIHBhY2thZ2UtLWRvd25sb2Fkcy1pbi1wcm9ncmVzcykKICAgICAo dXNlci1lcnJvciAiUGFja2FnZSByZWZyZXNoIGlzIGFscmVhZHkgaW4gcHJvZ3Jlc3MsIHBsZWFz ZSB3YWl0Li4uIikpCiAgIChzZXRxIHBhY2thZ2UtbWVudS0tb2xkLWFyY2hpdmUtY29udGVudHMg cGFja2FnZS1hcmNoaXZlLWNvbnRlbnRzKQpAQCAtMzE3Niw2ICszMTc5LDcgQEAgcGFja2FnZS1t ZW51LWhpZGUtcGFja2FnZQogICAiSGlkZSBhIHBhY2thZ2UgdW5kZXIgcG9pbnQgaW4gUGFja2Fn ZSBNZW51LgogSWYgb3B0aW9uYWwgYXJnIEJVVFRPTiBpcyBub24tbmlsLCBkZXNjcmliZSBpdHMg YXNzb2NpYXRlZCBwYWNrYWdlLiIKICAgKGludGVyYWN0aXZlKQorICAocGFja2FnZS0tZW5zdXJl LXBhY2thZ2UtbWVudS1tb2RlKQogICAoZGVjbGFyZSAoaW50ZXJhY3RpdmUtb25seSAiY2hhbmdl IGBwYWNrYWdlLWhpZGRlbi1yZWdleHBzJyBpbnN0ZWFkLiIpKQogICAobGV0KiAoKG5hbWUgKHdo ZW4gKGRlcml2ZWQtbW9kZS1wICdwYWNrYWdlLW1lbnUtbW9kZSkKICAgICAgICAgICAgICAgICAg KGNvbmNhdCAiXFxgIiAocmVnZXhwLXF1b3RlIChzeW1ib2wtbmFtZSAocGFja2FnZS1kZXNjLW5h bWUKQEAgLTMyMDksNiArMzIxMyw3IEBAIHBhY2thZ2UtbWVudS1kZXNjcmliZS1wYWNrYWdlCiAo ZGVmdW4gcGFja2FnZS1tZW51LW1hcmstZGVsZXRlICgmb3B0aW9uYWwgX251bSkKICAgIk1hcmsg YSBwYWNrYWdlIGZvciBkZWxldGlvbiBhbmQgbW92ZSB0byB0aGUgbmV4dCBsaW5lLiIKICAgKGlu dGVyYWN0aXZlICJwIikKKyAgKHBhY2thZ2UtLWVuc3VyZS1wYWNrYWdlLW1lbnUtbW9kZSkKICAg KGlmIChtZW1iZXIgKHBhY2thZ2UtbWVudS1nZXQtc3RhdHVzKQogICAgICAgICAgICAgICAnKCJp bnN0YWxsZWQiICJkZXBlbmRlbmN5IiAib2Jzb2xldGUiICJ1bnNpZ25lZCIpKQogICAgICAgKHRh YnVsYXRlZC1saXN0LXB1dC10YWcgIkQiIHQpCkBAIC0zMjE3LDYgKzMyMjIsNyBAQCBwYWNrYWdl LW1lbnUtbWFyay1kZWxldGUKIChkZWZ1biBwYWNrYWdlLW1lbnUtbWFyay1pbnN0YWxsICgmb3B0 aW9uYWwgX251bSkKICAgIk1hcmsgYSBwYWNrYWdlIGZvciBpbnN0YWxsYXRpb24gYW5kIG1vdmUg dG8gdGhlIG5leHQgbGluZS4iCiAgIChpbnRlcmFjdGl2ZSAicCIpCisgIChwYWNrYWdlLS1lbnN1 cmUtcGFja2FnZS1tZW51LW1vZGUpCiAgIChpZiAobWVtYmVyIChwYWNrYWdlLW1lbnUtZ2V0LXN0 YXR1cykgJygiYXZhaWxhYmxlIiAiYXZhaWwtb2JzbyIgIm5ldyIgImRlcGVuZGVuY3kiKSkKICAg ICAgICh0YWJ1bGF0ZWQtbGlzdC1wdXQtdGFnICJJIiB0KQogICAgIChmb3J3YXJkLWxpbmUpKSkK QEAgLTMyMjQsMTcgKzMyMzAsMjAgQEAgcGFja2FnZS1tZW51LW1hcmstaW5zdGFsbAogKGRlZnVu IHBhY2thZ2UtbWVudS1tYXJrLXVubWFyayAoJm9wdGlvbmFsIF9udW0pCiAgICJDbGVhciBhbnkg bWFya3Mgb24gYSBwYWNrYWdlIGFuZCBtb3ZlIHRvIHRoZSBuZXh0IGxpbmUuIgogICAoaW50ZXJh Y3RpdmUgInAiKQorICAocGFja2FnZS0tZW5zdXJlLXBhY2thZ2UtbWVudS1tb2RlKQogICAodGFi dWxhdGVkLWxpc3QtcHV0LXRhZyAiICIgdCkpCiAKIChkZWZ1biBwYWNrYWdlLW1lbnUtYmFja3Vw LXVubWFyayAoKQogICAiQmFjayB1cCBvbmUgbGluZSBhbmQgY2xlYXIgYW55IG1hcmtzIG9uIHRo YXQgcGFja2FnZS4iCiAgIChpbnRlcmFjdGl2ZSkKKyAgKHBhY2thZ2UtLWVuc3VyZS1wYWNrYWdl LW1lbnUtbW9kZSkKICAgKGZvcndhcmQtbGluZSAtMSkKICAgKHRhYnVsYXRlZC1saXN0LXB1dC10 YWcgIiAiKSkKIAogKGRlZnVuIHBhY2thZ2UtbWVudS1tYXJrLW9ic29sZXRlLWZvci1kZWxldGlv biAoKQogICAiTWFyayBhbGwgb2Jzb2xldGUgcGFja2FnZXMgZm9yIGRlbGV0aW9uLiIKICAgKGlu dGVyYWN0aXZlKQorICAocGFja2FnZS0tZW5zdXJlLXBhY2thZ2UtbWVudS1tb2RlKQogICAoc2F2 ZS1leGN1cnNpb24KICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQogICAgICh3aGlsZSAobm90 IChlb2JwKSkKQEAgLTMyNjUsNiArMzI3NCw3IEBAIHBhY2thZ2UtbWVudS1xdWljay1oZWxwCiAg ICJTaG93IHNob3J0IGtleSBiaW5kaW5nIGhlbHAgZm9yIGBwYWNrYWdlLW1lbnUtbW9kZScuCiBU aGUgZnVsbCBsaXN0IG9mIGtleXMgY2FuIGJlIHZpZXdlZCB3aXRoIFxcW2Rlc2NyaWJlLW1vZGVd LiIKICAgKGludGVyYWN0aXZlKQorICAocGFja2FnZS0tZW5zdXJlLXBhY2thZ2UtbWVudS1tb2Rl KQogICAobWVzc2FnZSAobWFwY29uY2F0ICMncGFja2FnZS0tcHJldHRpZnktcXVpY2staGVscC1r ZXkKICAgICAgICAgICAgICAgICAgICAgICBwYWNrYWdlLS1xdWljay1oZWxwLWtleXMgIlxuIikp KQogCkBAIC0zMjczLDYgKzMyODMsNyBAQCBwYWNrYWdlLW1lbnUtcXVpY2staGVscAogCiAoZGVm dW4gcGFja2FnZS1tZW51LWdldC1zdGF0dXMgKCkKICAgIlJldHVybiBzdGF0dXMgdGV4dCBvZiBw YWNrYWdlIGF0IHBvaW50IGluIFBhY2thZ2UgTWVudS4iCisgIChwYWNrYWdlLS1lbnN1cmUtcGFj a2FnZS1tZW51LW1vZGUpCiAgIChsZXQqICgoaWQgKHRhYnVsYXRlZC1saXN0LWdldC1pZCkpCiAg ICAgICAgICAoZW50cnkgKGFuZCBpZCAoYXNzb2MgaWQgdGFidWxhdGVkLWxpc3QtZW50cmllcykp KSkKICAgICAoaWYgZW50cnkKQEAgLTMzMjgsOCArMzMzOSw2IEBAIHBhY2thZ2UtbWVudS0tbWFy ay11cGdyYWRlcy1wZW5kaW5nCiAoZGVmdW4gcGFja2FnZS1tZW51LS1tYXJrLXVwZ3JhZGVzLTEg KCkKICAgIk1hcmsgYWxsIHVwZ3JhZGFibGUgcGFja2FnZXMgaW4gdGhlIFBhY2thZ2UgTWVudS4K IEltcGxlbWVudGF0aW9uIG9mIGBwYWNrYWdlLW1lbnUtbWFyay11cGdyYWRlcycuIgotICAodW5s ZXNzIChkZXJpdmVkLW1vZGUtcCAncGFja2FnZS1tZW51LW1vZGUpCi0gICAgKGVycm9yICJUaGUg Y3VycmVudCBidWZmZXIgaXMgbm90IGEgUGFja2FnZSBNZW51IikpCiAgIChzZXRxIHBhY2thZ2Ut bWVudS0tbWFyay11cGdyYWRlcy1wZW5kaW5nIG5pbCkKICAgKGxldCAoKHVwZ3JhZGVzIChwYWNr YWdlLW1lbnUtLWZpbmQtdXBncmFkZXMpKSkKICAgICAoaWYgKG51bGwgdXBncmFkZXMpCkBAIC0z MzYxLDYgKzMzNzAsNyBAQCBwYWNrYWdlLW1lbnUtbWFyay11cGdyYWRlcwogYmUgcGxhY2VkIGFz IHBhcnQgb2YgYHBhY2thZ2UtbWVudS0tcG9zdC1yZWZyZXNoJyBpbnN0ZWFkIG9mCiBpbW1lZGlh dGVseS4iCiAgIChpbnRlcmFjdGl2ZSkKKyAgKHBhY2thZ2UtLWVuc3VyZS1wYWNrYWdlLW1lbnUt bW9kZSkKICAgKGlmIChub3QgcGFja2FnZS0tZG93bmxvYWRzLWluLXByb2dyZXNzKQogICAgICAg KHBhY2thZ2UtbWVudS0tbWFyay11cGdyYWRlcy0xKQogICAgIChzZXRxIHBhY2thZ2UtbWVudS0t bWFyay11cGdyYWRlcy1wZW5kaW5nIHQpCkBAIC0zNDU0LDggKzM0NjQsNyBAQCBwYWNrYWdlLW1l bnUtZXhlY3V0ZQogcGFja2FnZXMgbWFya2VkIGZvciBkZWxldGlvbiBhcmUgcmVtb3ZlZC4KIE9w dGlvbmFsIGFyZ3VtZW50IE5PUVVFUlkgbm9uLW5pbCBtZWFucyBkbyBub3QgYXNrIHRoZSB1c2Vy IHRvIGNvbmZpcm0uIgogICAoaW50ZXJhY3RpdmUpCi0gICh1bmxlc3MgKGRlcml2ZWQtbW9kZS1w ICdwYWNrYWdlLW1lbnUtbW9kZSkKLSAgICAoZXJyb3IgIlRoZSBjdXJyZW50IGJ1ZmZlciBpcyBu b3QgaW4gUGFja2FnZSBNZW51IG1vZGUiKSkKKyAgKHBhY2thZ2UtLWVuc3VyZS1wYWNrYWdlLW1l bnUtbW9kZSkKICAgKGxldCAoaW5zdGFsbC1saXN0IGRlbGV0ZS1saXN0IGNtZCBwa2ctZGVzYykK ICAgICAoc2F2ZS1leGN1cnNpb24KICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCkBAIC0z NjgxLDYgKzM2OTAsNyBAQCBwYWNrYWdlLW1lbnUtZmlsdGVyLWJ5LWtleXdvcmQKICAgKGludGVy YWN0aXZlCiAgICAobGlzdCAoY29tcGxldGluZy1yZWFkLW11bHRpcGxlCiAgICAgICAgICAgIktl eXdvcmRzIChjb21tYSBzZXBhcmF0ZWQpOiAiIChwYWNrYWdlLWFsbC1rZXl3b3JkcykpKSkKKyAg KHBhY2thZ2UtLWVuc3VyZS1wYWNrYWdlLW1lbnUtbW9kZSkKICAgKHBhY2thZ2Utc2hvdy1wYWNr YWdlLWxpc3QgdCAoaWYgKHN0cmluZ3Aga2V5d29yZCkKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGxpc3Qga2V5d29yZCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGtleXdvcmQpKSkKQEAgLTM2OTAsNiArMzcwMCw3IEBAIHBhY2thZ2UtbWVudS1maWx0ZXIt YnktbmFtZQogU2hvdyBvbmx5IHRob3NlIGl0ZW1zIHdob3NlIG5hbWUgbWF0Y2hlcyB0aGUgcmVn dWxhciBleHByZXNzaW9uCiBOQU1FLiAgSWYgTkFNRSBpcyBuaWwgb3IgdGhlIGVtcHR5IHN0cmlu Zywgc2hvdyBhbGwgcGFja2FnZXMuIgogICAoaW50ZXJhY3RpdmUgKGxpc3QgKHJlYWQtZnJvbS1t aW5pYnVmZmVyICJGaWx0ZXIgYnkgbmFtZSAocmVnZXhwKTogIikpKQorICAocGFja2FnZS0tZW5z dXJlLXBhY2thZ2UtbWVudS1tb2RlKQogICAoaWYgKG9yIChub3QgbmFtZSkgKHN0cmluZy1lbXB0 eS1wIG5hbWUpKQogICAgICAgKHBhY2thZ2Utc2hvdy1wYWNrYWdlLWxpc3QgdCBuaWwpCiAgICAg OzsgVXBkYXRlIGB0YWJ1bGF0ZWQtbGlzdC1lbnRyaWVzJyBzbyB0aGF0IGl0IGNvbnRhaW5zIGFs bApAQCAtMzcwNyw2ICszNzE4LDcgQEAgcGFja2FnZS1tZW51LWZpbHRlci1ieS1uYW1lCiAoZGVm dW4gcGFja2FnZS1tZW51LWNsZWFyLWZpbHRlciAoKQogICAiQ2xlYXIgYW55IGZpbHRlciBjdXJy ZW50bHkgYXBwbGllZCB0byB0aGUgXCIqUGFja2FnZXMqXCIgYnVmZmVyLiIKICAgKGludGVyYWN0 aXZlKQorICAocGFja2FnZS0tZW5zdXJlLXBhY2thZ2UtbWVudS1tb2RlKQogICAocGFja2FnZS1t ZW51LS1nZW5lcmF0ZSB0IHQpKQogCiAoZGVmdW4gcGFja2FnZS1saXN0LXBhY2thZ2VzLW5vLWZl dGNoICgpCi0tIAoyLjIzLjAKCg== --0000000000007f944d05959624fe--