From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#63648: 29.0.90; project.el: with switch-use-entire-map, switch-project errors on non-project commands Date: Wed, 1 Nov 2023 23:12:15 +0200 Message-ID: References: <86il88x9cy.fsf@mail.linkov.net> <4367c45c-95b3-6a29-4ba3-068a3c748452@gutov.dev> <2e34e515-a921-a969-0915-bea94c745f8b@gutov.dev> <868r9258oi.fsf@mail.linkov.net> <86edishisp.fsf@mail.linkov.net> <6fc81cbf-a21f-c5b4-aa56-e8518b8570d7@gutov.dev> <86msxgatuy.fsf@mail.linkov.net> <86y1gynr2u.fsf@mail.linkov.net> <7c72fd8c-c3f6-a974-8a4b-a081f7a9fe1a@gutov.dev> <86ttqmv7c6.fsf@mail.linkov.net> <56e7d865-0456-db7d-3a5d-1235e62508bf@gutov.dev> <865y31onju.fsf@mail.linkov.net> <8562bdad-e487-886a-af49-7f67d8d14b7a@gutov.dev> <86msw9g5yb.fsf@mail.linkov.net> <56909bdd-14ee-f68c-178f-5057efcd6150@gutov.dev> <86wmva7iey.fsf@mail.linkov.net> <86bkckwnf8.fsf@mail.linkov.net> <86h6mag077.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------hSjSvt90mR6XL6E0EM0Ud0al" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32255"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: Spencer Baugh , 63648@debbugs.gnu.org, sbaugh@catern.com To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Nov 01 22:13:47 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qyIX3-00087x-Al for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 01 Nov 2023 22:13:46 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyIWo-0000I1-F3; Wed, 01 Nov 2023 17:13:30 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyIWl-0000HI-To for bug-gnu-emacs@gnu.org; Wed, 01 Nov 2023 17:13:28 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyIWl-0007YA-Jh for bug-gnu-emacs@gnu.org; Wed, 01 Nov 2023 17:13:27 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyIXJ-0005PP-Uh for bug-gnu-emacs@gnu.org; Wed, 01 Nov 2023 17:14:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 01 Nov 2023 21:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63648 X-GNU-PR-Package: emacs Original-Received: via spool by 63648-submit@debbugs.gnu.org id=B63648.169887319220720 (code B ref 63648); Wed, 01 Nov 2023 21:14:01 +0000 Original-Received: (at 63648) by debbugs.gnu.org; 1 Nov 2023 21:13:12 +0000 Original-Received: from localhost ([127.0.0.1]:52725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyIWS-0005O3-EV for submit@debbugs.gnu.org; Wed, 01 Nov 2023 17:13:12 -0400 Original-Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyIWJ-0005NP-Oc for 63648@debbugs.gnu.org; Wed, 01 Nov 2023 17:13:06 -0400 Original-Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 5DFF35C028F; Wed, 1 Nov 2023 17:12:19 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Wed, 01 Nov 2023 17:12:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1698873139; x=1698959539; bh=Ll XVYf4L7nqk/x6F7Ko2ubw2BPb9HkdU6WJlPYuZn5w=; b=JfItaLjfzUS6de2fhN Q/l9IssUYs/Qr6po9TtrURY1ndtfMKXnsp7EJkektafQALNalfXHGxtQ6Bd/37Mj XjUczMEnJQxYHOZVg5NmqAw7zFn7AuogOQoW0Ydol8KeGC0/XOOHyvR60y5E/LkM k1qdwq3+50UK8YakLc9WAZdBH1xQqc+gizrIdlAKZOsTAGNSoe4kuuh6ACdxIOCV woiIi993q2VDmG8PdXHmLO0WTUoWglJR2wQjPhK0kQRVEhxCLoKXAmf0/dADCaME V2MJ7Y/MTyV1JiN17DOCkpWqpVGjuE3Vtmp78ZERvhGZUj0LKZjvZUdxuD5E+GHT R26Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1698873139; x=1698959539; bh=LlXVYf4L7nqk/ x6F7Ko2ubw2BPb9HkdU6WJlPYuZn5w=; b=ukAeDGQrkvnH7f4RN4pbBGhJ+p23i Qz0wCKoTlt6Djj/isww8eqSud/GmxBp1dPnBqM8HFPqrjLJudfyG8YZKyG3Npj+C Ta0B095ActqmOYjS0qo+4z0aj2EFYwu3x3MVAog6CbS3BPf1RBlhF0111nMKWT4i Lz8P2Mh3LQgnuibc3yE/TH2KRsKHSIes/38czAQbvKZXlIRX0eGTBpK55x5XXMNv OLwR5eQVhlU1dtijWWM2kWYkpZn4ExpUwX81zffBWIAy3cfWYwa8CrKzeZn1JbTg RX4R3Q45h5V9ZIIrvkEbIhUq66tRoc8927JIEzEZ5gOYXYPTOJSM+acpw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddtgedgudeggecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpegtkfffgggfuffvvehfhfgjsehmtderredtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepheetkefgteeiueejuedvtddvleetffeljeetuddvfeffjeeiheehueetffev ieejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 1 Nov 2023 17:12:17 -0400 (EDT) Content-Language: en-US In-Reply-To: <86h6mag077.fsf@mail.linkov.net> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:273623 Archived-At: This is a multi-part message in MIME format. --------------hSjSvt90mR6XL6E0EM0Ud0al Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 28/10/2023 19:56, Juri Linkov wrote: >>>>>> + ;; Variation: could be a separate command, or an option. >>>>>> + ;; (command (let ((overriding-local-map project-prefix-map)) >>>>>> + ;; (key-binding (read-key-sequence >>>>>> + ;; (format "[execute in %s]:" (project-root pr))) >>>>>> + ;; t))) >>>>> Thanks, it works nicely. >>>>> Any reason not to use this by default? >>>> >>>> Nothing critical, but it might not fit the expectations without additional >>>> instructions in the prompt, or it can be unnecessary if the user had >>>> reached this command through 'C-x p o'. >>> Indeed, this is needed only for 'C-x p p' that supports the global map. >>> >>>> In the latter case there is also a small chance that the user had set up >>>> some advanced sub-maps inside project-prefix-map which would shadow some >>>> global bindings. So maybe a separate command is best. Please see how you >>>> like the attached new version together with >>>> >>>> (setq project-switch-commands #'project-prefix-or-any-command) >>> A separate command that is not used anywhere looks strange. >>> Why not a simple option like 'project-switch-use-entire-map'? >> >> You would still need to change project-switch-commands, right? Or what >> would the option be called? > > I expected 'project-switch-use-global-map' to be used > by 'project--switch-project-command' without the need > to customize 'project-switch-commands'. How about this, then? project-switch-use-global-map is obsoleted, all variations are accessible through customizing project-switch-commands. Should have better discoverability for project-prefix-or-any-command than simply having it included. >>>> I'm not sure about project-prefix-or-any-command's prompt, though (phrasing >>>> feels awkward). Improvements welcome. >>> I'm not a fan of the long prompt especially that wraps to the second >>> line. >> >> It didn't wrap for me. > > Because the length depends on the deepness of the project root. > >> But if it's too long, how would you like it changed? >> Remove everything? Just keep [executing in ...]? > > I'd prefer keeping only [executing in ...] because it's useful > to confirm in which directory the command will be executed. > But all available keys are usually useless except in such modes > as help-quick for novices. I don't like having a prompt that requires prior knowledge to use, but fair enough, let's just use [executing in ...] for now. Perhaps someone will suggest an alternative later. The new revision is attached, have a look. --------------hSjSvt90mR6XL6E0EM0Ud0al Content-Type: text/x-patch; charset=UTF-8; name="project-other-command-v5.diff" Content-Disposition: attachment; filename="project-other-command-v5.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3Byb2plY3QuZWwgYi9saXNwL3Byb2dtb2Rl cy9wcm9qZWN0LmVsCmluZGV4IDU3ZDlkOGU5OWFiLi45MTg2YWY2NjNjYiAxMDA2NDQKLS0t IGEvbGlzcC9wcm9nbW9kZXMvcHJvamVjdC5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9wcm9q ZWN0LmVsCkBAIC04NTUsNiArODU1LDcgQEAgcHJvamVjdC1wcmVmaXgtbWFwCiAgICAgKGRl ZmluZS1rZXkgbWFwICJHIiAncHJvamVjdC1vci1leHRlcm5hbC1maW5kLXJlZ2V4cCkKICAg ICAoZGVmaW5lLWtleSBtYXAgInIiICdwcm9qZWN0LXF1ZXJ5LXJlcGxhY2UtcmVnZXhwKQog ICAgIChkZWZpbmUta2V5IG1hcCAieCIgJ3Byb2plY3QtZXhlY3V0ZS1leHRlbmRlZC1jb21t YW5kKQorICAgIChkZWZpbmUta2V5IG1hcCAibyIgJ3Byb2plY3QtYW55LWNvbW1hbmQpCiAg ICAgKGRlZmluZS1rZXkgbWFwICJcQy1iIiAncHJvamVjdC1saXN0LWJ1ZmZlcnMpCiAgICAg bWFwKQogICAiS2V5bWFwIGZvciBwcm9qZWN0IGNvbW1hbmRzLiIpCkBAIC0xODE3LDYgKzE4 MTgsNDYgQEAgcHJvamVjdC1leGVjdXRlLWV4dGVuZGVkLWNvbW1hbmQKICAgKGxldCAoKGRl ZmF1bHQtZGlyZWN0b3J5IChwcm9qZWN0LXJvb3QgKHByb2plY3QtY3VycmVudCB0KSkpKQog ICAgIChjYWxsLWludGVyYWN0aXZlbHkgIydleGVjdXRlLWV4dGVuZGVkLWNvbW1hbmQpKSkK IAorOzs7IyMjYXV0b2xvYWQKKyhkZWZ1biBwcm9qZWN0LWFueS1jb21tYW5kICgmb3B0aW9u YWwgb3ZlcnJpZGluZy1tYXAgcHJvbXB0LWZvcm1hdCkKKyAgIlJ1biB0aGUgbmV4dCBjb21t YW5kIGluIHRoZSBjdXJyZW50IHByb2plY3QuCitJZiB0aGUgY29tbWFuZCBpcyBpbiBgcHJv amVjdC1wcmVmaXgtbWFwJywgaXQgZ2V0cyBwYXNzZWQgdGhhdAoraW5mbyB3aXRoIGBwcm9q ZWN0LWN1cnJlbnQtZGlyZWN0b3J5LW92ZXJyaWRlJy4gIE90aGVyd2lzZSwKK2BkZWZhdWx0 LWRpcmVjdG9yeScgaXMgdGVtcG9yYXJpbHkgc2V0IHRvIHRoZSBjdXJyZW50IHByb2plY3Qn cworcm9vdC4KKworSWYgT1ZFUlJJRElORy1NQVAgaXMgbm9uLW5pbCwgaXQgd2lsbCBiZSB1 c2VkIGFzCitgb3ZlcnJpZGluZy1sb2NhbC1tYXAnIHRvIHByb3ZpZGUgc2hvcnRlciBiaW5k aW5ncyBmcm9tIHRoYXQgbWFwCit3aGljaCB3aWxsIHRha2UgcHJpb3JpdHkgb3ZlciB0aGUg Z2xvYmFsIG9uZXMuIgorICAoaW50ZXJhY3RpdmUpCisgIChsZXQqICgocHIgKHByb2plY3Qt Y3VycmVudCB0KSkKKyAgICAgICAgIChwcm9tcHQtZm9ybWF0IChvciBwcm9tcHQtZm9ybWF0 ICJbZXhlY3V0ZSBpbiAlc106IikpCisgICAgICAgICAoY29tbWFuZCAobGV0ICgob3ZlcnJp ZGluZy1sb2NhbC1tYXAgb3ZlcnJpZGluZy1tYXApKQorICAgICAgICAgICAgICAgICAgICAo a2V5LWJpbmRpbmcgKHJlYWQta2V5LXNlcXVlbmNlCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGZvcm1hdCBwcm9tcHQtZm9ybWF0IChwcm9qZWN0LXJvb3QgcHIpKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHQpKSkKKyAgICAgICAgIChyb290 IChwcm9qZWN0LXJvb3QgcHIpKQorICAgICAgICAgZm91bmQpCisgICAgKHdoZW4gY29tbWFu ZAorICAgICAgOzsgV2UgY291bGQgYWxzbyBjaGVjayB0aGUgY29tbWFuZCBuYW1lIGFnYWlu c3QgIlxcYHByb2plY3QtIiwKKyAgICAgIDs7IGFuZC9vciAoZ2V0IGNvbW1hbmQgJ3Byb2pl Y3QtY29tbWFuZCkuCisgICAgICAobWFwLWtleW1hcAorICAgICAgIChsYW1iZGEgKF9ldnQg Y21kKSAoaWYgKGVxIGNtZCBjb21tYW5kKSAoc2V0cSBmb3VuZCB0KSkpCisgICAgICAgcHJv amVjdC1wcmVmaXgtbWFwKQorICAgICAgKGlmIGZvdW5kCisgICAgICAgICAgKGxldCAoKHBy b2plY3QtY3VycmVudC1kaXJlY3Rvcnktb3ZlcnJpZGUgcm9vdCkpCisgICAgICAgICAgICAo Y2FsbC1pbnRlcmFjdGl2ZWx5IGNvbW1hbmQpKQorICAgICAgICAobGV0ICgoZGVmYXVsdC1k aXJlY3Rvcnkgcm9vdCkpCisgICAgICAgICAgKGNhbGwtaW50ZXJhY3RpdmVseSBjb21tYW5k KSkpKSkpCisKKzs7OyMjI2F1dG9sb2FkCisoZGVmdW4gcHJvamVjdC1wcmVmaXgtb3ItYW55 LWNvbW1hbmQgKCkKKyAgIlJ1biB0aGUgbmV4dCBjb21tYW5kIGluIHRoZSBjdXJyZW50IHBy b2plY3QuCitXb3JrcyBsaWtlIGBwcm9qZWN0LWFueS1jb21tYW5kJywgYnV0IGFsc28gbWl4 ZXMgaW4gdGhlIHNob3J0ZXIKK2JpbmRpbmdzIGZyb20gYHByb2plY3QtcHJlZml4LW1hcCcu IgorICAoaW50ZXJhY3RpdmUpCisgIChwcm9qZWN0LWFueS1jb21tYW5kIHByb2plY3QtcHJl Zml4LW1hcCAiW2V4ZWN1dGUgaW4gJXNdOiIpKQorCiAoZGVmdW4gcHJvamVjdC1yZW1lbWJl ci1wcm9qZWN0cy11bmRlciAoZGlyICZvcHRpb25hbCByZWN1cnNpdmUpCiAgICJJbmRleCBh bGwgcHJvamVjdHMgYmVsb3cgYSBkaXJlY3RvcnkgRElSLgogSWYgUkVDVVJTSVZFIGlzIG5v bi1uaWwsIHJlY3Vyc2UgaW50byBhbGwgc3ViZGlyZWN0b3JpZXMgdG8gZmluZApAQCAtMTg5 NSw3ICsxOTM2LDggQEAgcHJvamVjdC1zd2l0Y2gtY29tbWFuZHMKICAgICAocHJvamVjdC1m aW5kLXJlZ2V4cCAiRmluZCByZWdleHAiKQogICAgIChwcm9qZWN0LWZpbmQtZGlyICJGaW5k IGRpcmVjdG9yeSIpCiAgICAgKHByb2plY3QtdmMtZGlyICJWQy1EaXIiKQotICAgIChwcm9q ZWN0LWVzaGVsbCAiRXNoZWxsIikpCisgICAgKHByb2plY3QtZXNoZWxsICJFc2hlbGwiKQor ICAgIChwcm9qZWN0LWFueS1jb21tYW5kICJPdGhlciIpKQogICAiQWxpc3QgbWFwcGluZyBj b21tYW5kcyB0byBkZXNjcmlwdGlvbnMuCiBVc2VkIGJ5IGBwcm9qZWN0LXN3aXRjaC1wcm9q ZWN0JyB0byBjb25zdHJ1Y3QgYSBkaXNwYXRjaCBtZW51IG9mCiBjb21tYW5kcyBhdmFpbGFi bGUgdXBvbiBcInN3aXRjaGluZ1wiIHRvIGFub3RoZXIgcHJvamVjdC4KQEAgLTE5MDcsNyAr MTk0OSwxNyBAQCBwcm9qZWN0LXN3aXRjaC1jb21tYW5kcwoga2V5IGlzIGxvb2tlZCB1cCBp biB0aGF0IG1hcC4KIAogVGhlIHZhbHVlIGNhbiBhbHNvIGJlIGEgc3ltYm9sLCB0aGUgbmFt ZSBvZiB0aGUgY29tbWFuZCB0byBiZQotaW52b2tlZCBpbW1lZGlhdGVseSB3aXRob3V0IGFu eSBkaXNwYXRjaCBtZW51LiIKK2ludm9rZWQgaW1tZWRpYXRlbHkgd2l0aG91dCBhbnkgZGlz cGF0Y2ggbWVudS4KKworT3IgaXQgY2FuIGJlIG9uZSBvZiB0d28gc3BlY2lhbCBzeW1ib2xz OgorCitgc2hvcnQta2V5cycgbWVhbnMgdGhlIGRpc3BhdGNoIG1lbnUgd2lsbCBmZWF0dXJl IGFsbCB0aGUKK29uZS1jaGFyYWN0ZXIgYmluZGluZ3MgZnJvbSBgcHJvamVjdC1wcmVmaXgt bWFwJy4gIFRoZSBwcm9tcHQKK3dpbGwgbG9vcCB1bnRpbCBvbmUgb2YgdGhvc2UgY2hhcmFj dGVycyBpcyBwcmVzc2VkLgorCitgc2hvcnQtb3ItYW55JyBtZWFucyB0aGF0IHRoZSBkaXNw YXRjaCB3aWxsIGFjY2VwdCBlaXRoZXIgYQorc2hvcnQga2V5IGZyb20gdGhlIGFib3ZlIG1h cCwgb3IgYW55IGdsb2JhbCBiaW5kaW5nIG5vdCBzaGFkb3dlZAorYnkgdGhlIGFib3ZlIGtl eXMuIgogICA6dmVyc2lvbiAiMjguMSIKICAgOmdyb3VwICdwcm9qZWN0CiAgIDpwYWNrYWdl LXZlcnNpb24gJyhwcm9qZWN0IC4gIjAuNi4wIikKQEAgLTE5MTksNyArMTk3MSw5IEBAIHBy b2plY3Qtc3dpdGNoLWNvbW1hbmRzCiAgICAgICAgICAgICAoY2hvaWNlIDp0YWcgIktleSB0 byBwcmVzcyIKICAgICAgICAgICAgICAgICAgICAgKGNvbnN0IDp0YWcgIkluZmVyIGZyb20g dGhlIGtleW1hcCIgbmlsKQogICAgICAgICAgICAgICAgICAgICAoY2hhcmFjdGVyIDp0YWcg IkV4cGxpY2l0IGtleSIpKSkpCi0gICAgICAgICAgKHN5bWJvbCA6dGFnICJTaW5nbGUgY29t bWFuZCIpKSkKKyAgICAgICAgICAoc3ltYm9sIDp0YWcgIlNpbmdsZSBjb21tYW5kIikKKyAg ICAgICAgICAoY29uc3QgOnRhZyAiVXNlIHNob3J0IGtleXMgZnJvbSBgcHJvamVjdC1wcmVm aXgtbWFwJyIgc2hvcnQta2V5cykKKyAgICAgICAgICAoY29uc3QgOnRhZyAiVXNlIHNob3J0 IGtleXMgYW5kIGdsb2JhbCBiaW5kaW5ncyIgc2hvcnQtb3ItYW55KSkpCiAKIChkZWZjdXN0 b20gcHJvamVjdC1zd2l0Y2gtdXNlLWVudGlyZS1tYXAgbmlsCiAgICJXaGV0aGVyIGBwcm9q ZWN0LXN3aXRjaC1wcm9qZWN0JyB3aWxsIHVzZSB0aGUgZW50aXJlIGBwcm9qZWN0LXByZWZp eC1tYXAnLgpAQCAtMTkzMiw2ICsxOTg2LDEzIEBAIHByb2plY3Qtc3dpdGNoLXVzZS1lbnRp cmUtbWFwCiAgIDpncm91cCAncHJvamVjdAogICA6dmVyc2lvbiAiMjguMSIpCiAKKyhtYWtl LW9ic29sZXRlLXZhcmlhYmxlCisgJ3Byb2plY3Qtc3dpdGNoLXVzZS1lbnRpcmUtbWFwCisg KGZvcm1hdC1tZXNzYWdlCisgICJzZXQgYHByb2plY3Qtc3dpdGNoLWNvbW1hbmRzJyB0byB0 aGUgdmFsdWUgYHNob3J0LWtleXMnIGluc3RlYWQuIikKKyAiMzAuMSIKKyAnc2V0KQorCiAo ZGVmY3VzdG9tIHByb2plY3Qta2V5LXByb21wdC1zdHlsZSAoaWYgKGZhY2VwICdoZWxwLWtl eS1iaW5kaW5nKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHQK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2JyYWNrZXRzKQpAQCAt MTk4NCw3ICsyMDQ1LDggQEAgcHJvamVjdC0tc3dpdGNoLXByb2plY3QtY29tbWFuZAogICAg ICAgICAgICAgICAgICA7OyBYWFg6IEFkZCBhIHdhcm5pbmcgYWJvdXQgaXQ/CiAgICAgICAg ICAgICAgICAgIChyZXZlcnNlIHJvdykKICAgICAgICAgICAgICAgIHJvdykpCi0gICAgICAg ICAgIHByb2plY3Qtc3dpdGNoLWNvbW1hbmRzKSkKKyAgICAgICAgICAgKGFuZCAobGlzdHAg cHJvamVjdC1zd2l0Y2gtY29tbWFuZHMpCisgICAgICAgICAgICAgICAgcHJvamVjdC1zd2l0 Y2gtY29tbWFuZHMpKSkKICAgICAgICAgIChjb21tYW5kcy1tYXAKICAgICAgICAgICAobGV0 ICgodGVtcC1tYXAgKG1ha2Utc3BhcnNlLWtleW1hcCkpKQogICAgICAgICAgICAgKHNldC1r ZXltYXAtcGFyZW50IHRlbXAtbWFwIHByb2plY3QtcHJlZml4LW1hcCkKQEAgLTE5OTIsMTEg KzIwNTQsMTMgQEAgcHJvamVjdC0tc3dpdGNoLXByb2plY3QtY29tbWFuZAogICAgICAgICAg ICAgICAod2hlbi1sZXQgKChjbWQgKG50aCAwIHJvdykpCiAgICAgICAgICAgICAgICAgICAg ICAgICAgKGtleWNoYXIgKG50aCAyIHJvdykpKQogICAgICAgICAgICAgICAgIChkZWZpbmUt a2V5IHRlbXAtbWFwICh2ZWN0b3Iga2V5Y2hhcikgY21kKSkpKSkKKyAgICAgICAgICh1c2Ut YWxsLXNob3J0LWtleXMgKG9yIHByb2plY3Qtc3dpdGNoLXVzZS1lbnRpcmUtbWFwCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZXEgcHJvamVjdC1zd2l0Y2gtY29tbWFu ZHMgJ3Nob3J0LWtleXMpKSkKICAgICAgICAgIGNvbW1hbmQKICAgICAgICAgIGNob2ljZSkK ICAgICAod2hpbGUgKG5vdCBjb21tYW5kKQogICAgICAgKGxldCogKChvdmVycmlkaW5nLWxv Y2FsLW1hcCBjb21tYW5kcy1tYXApCi0gICAgICAgICAgICAgKHByb21wdCAoaWYgcHJvamVj dC1zd2l0Y2gtdXNlLWVudGlyZS1tYXAKKyAgICAgICAgICAgICAocHJvbXB0IChpZiB1c2Ut YWxsLXNob3J0LWtleXMKICAgICAgICAgICAgICAgICAgICAgICAgICAocHJvamVjdC0ta2V5 bWFwLXByb21wdCkKICAgICAgICAgICAgICAgICAgICAgICAgKHByb2plY3QtLW1lbnUtcHJv bXB0KSkpKQogICAgICAgICAod2hlbiBjaG9pY2UKQEAgLTIwMDgsNyArMjA3Miw3IEBAIHBy b2plY3QtLXN3aXRjaC1wcm9qZWN0LWNvbW1hbmQKICAgICAgICAgKHNldHEgY2hvaWNlIChy ZWFkLWtleS1zZXF1ZW5jZSAoY29uY2F0ICJDaG9vc2U6ICIgcHJvbXB0KSkpCiAgICAgICAg ICh3aGVuIChzZXRxIGNvbW1hbmQgKGxvb2t1cC1rZXkgY29tbWFuZHMtbWFwIGNob2ljZSkp CiAgICAgICAgICAgKHdoZW4gKG51bWJlcnAgY29tbWFuZCkgKHNldHEgY29tbWFuZCBuaWwp KQotICAgICAgICAgICh1bmxlc3MgKG9yIHByb2plY3Qtc3dpdGNoLXVzZS1lbnRpcmUtbWFw CisgICAgICAgICAgKHVubGVzcyAob3IgdXNlLWFsbC1zaG9ydC1rZXlzCiAgICAgICAgICAg ICAgICAgICAgICAgKGFzc3EgY29tbWFuZCBjb21tYW5kcy1tZW51KSkKICAgICAgICAgICAg IChzZXRxIGNvbW1hbmQgbmlsKSkpCiAgICAgICAgIChsZXQgKChnbG9iYWwtY29tbWFuZCAo bG9va3VwLWtleSAoY3VycmVudC1nbG9iYWwtbWFwKSBjaG9pY2UpKSkKQEAgLTIwMjcsOSAr MjA5MSwxNCBAQCBwcm9qZWN0LXN3aXRjaC1wcm9qZWN0CiBXaGVuIGNhbGxlZCBpbiBhIHBy b2dyYW0sIGl0IHdpbGwgdXNlIHRoZSBwcm9qZWN0IGNvcnJlc3BvbmRpbmcKIHRvIGRpcmVj dG9yeSBESVIuIgogICAoaW50ZXJhY3RpdmUgKGxpc3QgKGZ1bmNhbGwgcHJvamVjdC1wcm9t cHRlcikpKQotICAobGV0ICgoY29tbWFuZCAoaWYgKHN5bWJvbHAgcHJvamVjdC1zd2l0Y2gt Y29tbWFuZHMpCi0gICAgICAgICAgICAgICAgICAgICBwcm9qZWN0LXN3aXRjaC1jb21tYW5k cwotICAgICAgICAgICAgICAgICAgIChwcm9qZWN0LS1zd2l0Y2gtcHJvamVjdC1jb21tYW5k KSkpCisgIChsZXQgKChjb21tYW5kCisgICAgICAgICAoY29uZAorICAgICAgICAgICgoZXEg cHJvamVjdC1zd2l0Y2gtY29tbWFuZHMgJ3Nob3J0LW9yLWFueSkKKyAgICAgICAgICAgIydw cm9qZWN0LXByZWZpeC1vci1hbnktY29tbWFuZCkKKyAgICAgICAgICAoKGFuZCAoc3ltYm9s cCBwcm9qZWN0LXN3aXRjaC1jb21tYW5kcykKKyAgICAgICAgICAgICAgICAobm90IChlcSBw cm9qZWN0LXN3aXRjaC1jb21tYW5kcyAnc2hvcnQta2V5cykpKQorICAgICAgICAgICBwcm9q ZWN0LXN3aXRjaC1jb21tYW5kcykKKyAgICAgICAgICAodCAocHJvamVjdC0tc3dpdGNoLXBy b2plY3QtY29tbWFuZCkpKSkKICAgICAgICAgKGJ1ZmZlciAoY3VycmVudC1idWZmZXIpKSkK ICAgICAodW53aW5kLXByb3RlY3QKICAgICAgICAgKHByb2duCg== --------------hSjSvt90mR6XL6E0EM0Ud0al--