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#62750: 29.0.50; Commands 'package-update' and 'package-update-all' should be called '*-upgrade' Date: Mon, 24 Apr 2023 02:06:45 +0300 Message-ID: References: <2726a957-a2a8-3b89-8930-2d620d83491e@alphapapa.net> <83sfd7c1v1.fsf@gnu.org> <875ya3euof.fsf@posteo.net> <87fs95a6y3.fsf@posteo.net> <83h6tl6xgn.fsf@gnu.org> <54892fb9-fcc5-d036-e0de-e199712ff7d4@gutov.dev> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------Yu2QB9bjll9000lxj9p0OPop" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3062"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Cc: adam@alphapapa.net, philipk@posteo.net, larsi@gnus.org, 62750@debbugs.gnu.org To: Stefan Monnier , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Apr 24 01:07:19 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 1pqind-0000cx-3M for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 24 Apr 2023 01:07:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqinR-0006wY-55; Sun, 23 Apr 2023 19:07:05 -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 1pqinO-0006vy-Ky for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2023 19:07:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqinO-0002wo-D0 for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2023 19:07:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqinN-0004y0-Lq for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2023 19:07: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: Sun, 23 Apr 2023 23:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62750 X-GNU-PR-Package: emacs Original-Received: via spool by 62750-submit@debbugs.gnu.org id=B62750.168229121719080 (code B ref 62750); Sun, 23 Apr 2023 23:07:01 +0000 Original-Received: (at 62750) by debbugs.gnu.org; 23 Apr 2023 23:06:57 +0000 Original-Received: from localhost ([127.0.0.1]:47103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqinI-0004xg-St for submit@debbugs.gnu.org; Sun, 23 Apr 2023 19:06:57 -0400 Original-Received: from new1-smtp.messagingengine.com ([66.111.4.221]:42949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqinG-0004xN-N1 for 62750@debbugs.gnu.org; Sun, 23 Apr 2023 19:06:55 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id 86C7F582266; Sun, 23 Apr 2023 19:06:49 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 23 Apr 2023 19:06:49 -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=1682291209; x=1682294809; bh=lH eA/Nlq/YaM/auT56UIYxSDBgvuIh8tA2vvLEjZ/ts=; b=ST8ZrZNlOYYtyA9Z8y jvvpFevoorO1R4FddEjM7gD3ukd5f2zBoA+4hzBT8Nc39OHpKbHph0LzGAQODTfe QCGaAmbhvm9dfPHjwxXydsfriL1+xXxTd0NUx5+ADTRck5OMAioPQ3EaIeXt72zF pFaBj9ZKgQY4ipuy6juIv5cVrS2/ahoV8bbZ5mfgWQJi1vgTEdS5/9/jNwKdkWWg u+YU390/WCAf81cpq7FSMGpuNSppyCzAddn8tcrn53PAH4nzJa2s0Z5/4vxPkG1M hJO74sKOLrsRzeUytG0p/uWIURGLNl9duuXCNA4oop9NDJgvxrvtSgR+4n2pinga 92ow== 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=1682291209; x=1682294809; bh=lHeA/Nlq/YaM/ auT56UIYxSDBgvuIh8tA2vvLEjZ/ts=; b=Ctzd7kWxLU9KVliLsjDowM5dsBTiu uGZhMSzzQaQZmpT3H1M1zxEAtx18T2NGsHhl78jbhSOzIc9h5+vLmFeFAtDJ98y9 rDojDWkZ0n9PYL9mlgii/0iWR+5xiPvAGFdLuGp4LgXlriuwcWG7yg0Tk15qOz+g EP0jIdS3nZ07Dccni1mN0osBQmi5rrVIf+U7W678OKm1LKlneuhwH0mB2lR0fMfz ZYiubBpicW2qTBjGh5spb2W6S8CYZDM92jT6rhsylpczpMkSi71TXdUXtIhgHNiS 5M4cgoeWV+L/syrwZj+/EAq/spDUvEVmbPsxjMKf+r1gutt5lAMuTFRWg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedtledgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurheptgfkffggfgfuhffvvehfjgesmhdtreertdefjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpeeiheegkeetgffghefhgeeiveeuudegvdeuteffhfettdelleehkeffledvuddt leenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumh hithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 23 Apr 2023 19:06:46 -0400 (EDT) Content-Language: en-US In-Reply-To: <54892fb9-fcc5-d036-e0de-e199712ff7d4@gutov.dev> 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:260543 Archived-At: This is a multi-part message in MIME format. --------------Yu2QB9bjll9000lxj9p0OPop Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 15/04/2023 04:34, Dmitry Gutov wrote: > On 12/04/2023 16:34, Stefan Monnier wrote: >>>> I hadn't realized that `package-update` hasn't been in a release >>>> yet, so >>>> we don't need such a compatibility alias. >>> Even though these commands were available under those names for the >>> last year or so? >> Well, that's for you to judge 😄 > > Since they're not very likely to be used in Lisp code, I'd say it's > unlikely to be a problem. > > Alternatively, we'll probably get around to fixing this inconsistency > sometime after this release, and then carry the compatibility aliases > for a number of years. Here's a couple of other existing functions: package--update-selected-packages package--update-downloads-in-progress Neither of these relate to upgrading packages. Although the former could be easy to mistake for that now. In all older functions, the term "update" (in comments and variable names) refers to updating the value of some variable, not packages. By analogy, 'M-x package-update-all' might be easy enough to mistake for updating the list of packages available for installation, for example. Here's a patch that does the rename. Also including package-vc-update* that Philip mentioned. --------------Yu2QB9bjll9000lxj9p0OPop Content-Type: text/x-patch; charset=UTF-8; name="0001-Rename-all-functions-called-package-update-to-packag.patch" Content-Disposition: attachment; filename*0="0001-Rename-all-functions-called-package-update-to-packag.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAxM2ZmMWYyNmRhMDdmNzMwMmU4OTg2MzhlZjRhNTM0MWMyOTEzOTQ4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBEbWl0cnkgR3V0b3YgPGRtaXRyeUBndXRvdi5kZXY+ CkRhdGU6IE1vbiwgMjQgQXByIDIwMjMgMDI6MDA6NTQgKzAzMDAKU3ViamVjdDogW1BBVENI XSBSZW5hbWUgYWxsIGZ1bmN0aW9ucyBjYWxsZWQgcGFja2FnZS0qLXVwZGF0ZS0qIHRvCiBw YWNrYWdlLSotdXBncmFkZS0qCgoqIGxpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXZjLmVsIChw YWNrYWdlLXZjLXVwZ3JhZGUtYWxsKToKUmVuYW1lIGZyb20gJ3BhY2thZ2UtdmMtdXBkYXRl LWFsbCcuCihwYWNrYWdlLXZjLXVwZ3JhZGUpOiBSZW5hbWUgZnJvbSAncGFja2FnZS12Yy11 cGRhdGUnLgoKKiBsaXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbCAocGFja2FnZS11cGdyYWRl KToKUmVuYW1lIGZyb20gJ3BhY2thZ2UtdXBkYXRlJyAoYnVnIzYyNzUwKS4KKHBhY2thZ2Ut LXVwZ3JhZGVhYmxlLXBhY2thZ2VzKToKUmVuYW1lIGZyb20gJ3BhY2thZ2UtLXVwZGF0ZWFi bGUtcGFja2FnZXMnLgoocGFja2FnZS11cGdyYWRlLWFsbCk6IFJlbmFtZSBmcm9tICdwYWNr YWdlLXVwZGF0ZS1hbGwnLgotLS0KIGRvYy9lbWFjcy9wYWNrYWdlLnRleGkgICAgICAgIHwg MTQgKysrKysrKy0tLS0tLS0KIGV0Yy9ORVdTICAgICAgICAgICAgICAgICAgICAgIHwgIDYg KysrLS0tCiBsaXNwL2VtYWNzLWxpc3AvcGFja2FnZS12Yy5lbCB8IDE4ICsrKysrKysrKy0t LS0tLS0tLQogbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UuZWwgICAgfCAzNCArKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlv bnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9lbWFjcy9wYWNrYWdl LnRleGkgYi9kb2MvZW1hY3MvcGFja2FnZS50ZXhpCmluZGV4IDJiMDMzOTliMGE3Li5kMTc2 NjAyNmRiMiAxMDA2NDQKLS0tIGEvZG9jL2VtYWNzL3BhY2thZ2UudGV4aQorKysgYi9kb2Mv ZW1hY3MvcGFja2FnZS50ZXhpCkBAIC0zMjksMTUgKzMyOSwxNSBAQCBQYWNrYWdlIEluc3Rh bGxhdGlvbgogQHNlY3Rpb24gUGFja2FnZSBJbnN0YWxsYXRpb24KIAogQGZpbmRleCBwYWNr YWdlLWluc3RhbGwKLUBmaW5kZXggcGFja2FnZS11cGRhdGUKLUBmaW5kZXggcGFja2FnZS11 cGRhdGUtYWxsCitAZmluZGV4IHBhY2thZ2UtdXBncmFkZQorQGZpbmRleCBwYWNrYWdlLXVw Z3JhZGUtYWxsCiAgIFBhY2thZ2VzIGFyZSBtb3N0IGNvbnZlbmllbnRseSBpbnN0YWxsZWQg dXNpbmcgdGhlIHBhY2thZ2UgbWVudQogKEBweHJlZntQYWNrYWdlIE1lbnV9KSwgYnV0IHlv dSBjYW4gYWxzbyB1c2UgdGhlIGNvbW1hbmQgQGtiZHtNLXgKIHBhY2thZ2UtaW5zdGFsbH0u ICBUaGlzIHByb21wdHMgZm9yIHRoZSBuYW1lIG9mIGEgcGFja2FnZSB3aXRoIHRoZQogQHNh bXB7YXZhaWxhYmxlfSBzdGF0dXMsIHRoZW4gZG93bmxvYWRzIGFuZCBpbnN0YWxscyBpdC4g IFNpbWlsYXJseSwKLWlmIHlvdSB3YW50IHRvIHVwZGF0ZSBhIHBhY2thZ2UsIHlvdSBjYW4g dXNlIHRoZSBAa2Jke00teAotcGFja2FnZS11cGRhdGV9IGNvbW1hbmQsIGFuZCBpZiB5b3Ug anVzdCB3YW50IHRvIHVwZGF0ZSBhbGwgdGhlCi1wYWNrYWdlcywgeW91IGNhbiB1c2UgdGhl IEBrYmR7TS14IHBhY2thZ2UtdXBkYXRlLWFsbH0gY29tbWFuZC4KK2lmIHlvdSB3YW50IHRv IHVwZ3JhZGUgYSBwYWNrYWdlLCB5b3UgY2FuIHVzZSB0aGUgQGtiZHtNLXgKK3BhY2thZ2Ut dXBncmFkZX0gY29tbWFuZCwgYW5kIGlmIHlvdSB3YW50IHRvIHVwZ3JhZGUgYWxsIHRoZSBw YWNrYWdlcywKK3lvdSBjYW4gdXNlIHRoZSBAa2Jke00teCBwYWNrYWdlLXVwZ3JhZGUtYWxs fSBjb21tYW5kLgogCiBAY2luZGV4IHBhY2thZ2UgcmVxdWlyZW1lbnRzCiAgIEEgcGFja2Fn ZSBtYXkgQGRmbntyZXF1aXJlfSBjZXJ0YWluIG90aGVyIHBhY2thZ2VzIHRvIGJlIGluc3Rh bGxlZCwKQEAgLTU1MSw4ICs1NTEsOCBAQCBGZXRjaGluZyBQYWNrYWdlIFNvdXJjZXMKIHNv dXJjZSBjb2RlIGZvciBhIHBhY2thZ2UgZGlyZWN0bHkgZnJvbSBzb3VyY2UuICBUaGUgY29t bWFuZCB3aWxsIGFsc28KIGF1dG9tYXRpY2FsbHkgZW5zdXJlIHRoYXQgYWxsIGZpbGVzIGFy ZSBieXRlLWNvbXBpbGVkIGFuZCBhdXRvLWxvYWRlZCwKIGp1c3QgbGlrZSB3aXRoIGEgcmVn dWxhciBwYWNrYWdlLiAgUGFja2FnZXMgaW5zdGFsbGVkIHRoaXMgd2F5IGJlaGF2ZQotanVz dCBsaWtlIGFueSBvdGhlciBwYWNrYWdlLiAgWW91IGNhbiB1cGRhdGUgdGhlbSB1c2luZwot QGNvZGV7cGFja2FnZS11cGRhdGV9IG9yIEBjb2Rle3BhY2thZ2UtdXBkYXRlLWFsbH0gYW5k IGRlbGV0ZSB0aGVtCitqdXN0IGxpa2UgYW55IG90aGVyIHBhY2thZ2UuICBZb3UgY2FuIHVw Z3JhZGUgdGhlbSB1c2luZworQGNvZGV7cGFja2FnZS11cGdyYWRlfSBvciBAY29kZXtwYWNr YWdlLXVwZ3JhZGUtYWxsfSBhbmQgZGVsZXRlIHRoZW0KIGFnYWluIHVzaW5nIEBjb2Rle3Bh Y2thZ2UtZGVsZXRlfS4gIFRoZXkgYXJlIGV2ZW4gZGlzcGxheWVkIGluIHRoZQogcmVndWxh ciBwYWNrYWdlIGxpc3RpbmcuICBJZiB5b3UganVzdCB3aXNoIHRvIGNsb25lIHRoZSBzb3Vy Y2Ugb2YgYQogcGFja2FnZSwgd2l0aG91dCBhZGRpbmcgaXQgdG8gdGhlIHBhY2thZ2UgbGlz dCwgdXNlCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdTCmluZGV4IDE4MjJmZjE3 MjY1Li5iNmM5ZDkwMTJiNiAxMDA2NDQKLS0tIGEvZXRjL05FV1MKKysrIGIvZXRjL05FV1MK QEAgLTE4MjgsMTMgKzE4MjgsMTMgQEAgdGhpcyBpbmNsdWRlcyAiYmluYXJ5IiBidWZmZXJz IGxpa2UgJ2FyY2hpdmUtbW9kZScgYW5kICdpbWFnZS1tb2RlJy4KICoqIFBhY2thZ2UKIAog KysrCi0qKiogTmV3IGNvbW1hbmQgJ3BhY2thZ2UtdXBkYXRlJy4KKyoqKiBOZXcgY29tbWFu ZCAncGFja2FnZS11cGdyYWRlJy4KIFRoaXMgY29tbWFuZCBhbGxvd3MgeW91IHRvIHVwZ3Jh ZGUgcGFja2FnZXMgd2l0aG91dCB1c2luZyAnTS14CiBsaXN0LXBhY2thZ2VzJy4KIAogKysr Ci0qKiogTmV3IGNvbW1hbmQgJ3BhY2thZ2UtdXBkYXRlLWFsbCcuCi1UaGlzIGNvbW1hbmQg YWxsb3dzIHVwZGF0aW5nIGFsbCBwYWNrYWdlcyB3aXRob3V0IGFueSBxdWVyaWVzLgorKioq IE5ldyBjb21tYW5kICdwYWNrYWdlLXVwZ3JhZGUtYWxsJy4KK1RoaXMgY29tbWFuZCBhbGxv d3MgdXBncmFkaW5nIGFsbCBwYWNrYWdlcyB3aXRob3V0IGFueSBxdWVyaWVzLgogCiArKysK ICoqKiBOZXcgY29tbWFuZHMgJ3BhY2thZ2UtcmVjb21waWxlJyBhbmQgJ3BhY2thZ2UtcmVj b21waWxlLWFsbCcuCmRpZmYgLS1naXQgYS9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS12Yy5l bCBiL2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXZjLmVsCmluZGV4IGFmNTcwOTVmOGNlLi5m YTlmY2UyNGFjYyAxMDA2NDQKLS0tIGEvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdmMuZWwK KysrIGIvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdmMuZWwKQEAgLTI0LDcgKzI0LDcgQEAK IAogOzsgV2hpbGUgcGFja2FnZXMgbWFuYWdlZCBieSBwYWNrYWdlLmVsIHVzZSB0YXJiYWxs cyBmb3IgZGlzdHJpYnV0aW5nCiA7OyB0aGUgc291cmNlIGNvZGUsIHRoaXMgZXh0ZW5zaW9u IGFsbG93cyBmb3IgcGFja2FnZXMgdG8gYmUgZmV0Y2hlZAotOzsgYW5kIHVwZGF0ZWQgZGly ZWN0bHkgZnJvbSBhIHZlcnNpb24gY29udHJvbCBzeXN0ZW0uCis7OyBhbmQgdXBncmFkZWQg ZGlyZWN0bHkgZnJvbSBhIHZlcnNpb24gY29udHJvbCBzeXN0ZW0uCiA7OwogOzsgVG8gaW5z dGFsbCBhIHBhY2thZ2UgZnJvbSBzb3VyY2UgdXNlIGBwYWNrYWdlLXZjLWluc3RhbGwnLiAg SWYgeW91CiA7OyBhcmVuJ3QgaW50ZXJlc3RlZCBpbiBhY3RpdmF0aW5nIGEgcGFja2FnZSwg eW91IGNhbiB1c2UKQEAgLTY2MCwxOSArNjYwLDE5IEBAIHBhY2thZ2UtdmMtLXJlYWQtcGFj a2FnZS1kZXNjCiAgICAgICAgICAgICAgICAjJ3N0cmluZz0pKSkKIAogOzs7IyMjYXV0b2xv YWQKLShkZWZ1biBwYWNrYWdlLXZjLXVwZGF0ZS1hbGwgKCkKLSAgIkF0dGVtcHQgdG8gdXBk YXRlIGFsbCBpbnN0YWxsZWQgVkMgcGFja2FnZXMuIgorKGRlZnVuIHBhY2thZ2UtdmMtdXBn cmFkZS1hbGwgKCkKKyAgIkF0dGVtcHQgdG8gdXBncmFkZSBhbGwgaW5zdGFsbGVkIFZDIHBh Y2thZ2VzLiIKICAgKGludGVyYWN0aXZlKQogICAoZG9saXN0IChwYWNrYWdlIHBhY2thZ2Ut YWxpc3QpCiAgICAgKGRvbGlzdCAocGtnLWRlc2MgKGNkciBwYWNrYWdlKSkKICAgICAgICh3 aGVuIChwYWNrYWdlLXZjLXAgcGtnLWRlc2MpCi0gICAgICAgIChwYWNrYWdlLXZjLXVwZGF0 ZSBwa2ctZGVzYykpKSkKLSAgKG1lc3NhZ2UgIkRvbmUgdXBkYXRpbmcgcGFja2FnZXMuIikp CisgICAgICAgIChwYWNrYWdlLXZjLXVwZ3JhZGUgcGtnLWRlc2MpKSkpCisgIChtZXNzYWdl ICJEb25lIHVwZ3JhZGluZyBwYWNrYWdlcy4iKSkKIAogOzs7IyMjYXV0b2xvYWQKLShkZWZ1 biBwYWNrYWdlLXZjLXVwZGF0ZSAocGtnLWRlc2MpCi0gICJBdHRlbXB0IHRvIHVwZGF0ZSB0 aGUgcGFja2FnZSBQS0ctREVTQy4iCi0gIChpbnRlcmFjdGl2ZSAobGlzdCAocGFja2FnZS12 Yy0tcmVhZC1wYWNrYWdlLWRlc2MgIlVwZGF0ZSBWQyBwYWNrYWdlOiAiIHQpKSkKKyhkZWZ1 biBwYWNrYWdlLXZjLXVwZ3JhZGUgKHBrZy1kZXNjKQorICAiQXR0ZW1wdCB0byB1cGdyYWRl IHRoZSBwYWNrYWdlIFBLRy1ERVNDLiIKKyAgKGludGVyYWN0aXZlIChsaXN0IChwYWNrYWdl LXZjLS1yZWFkLXBhY2thZ2UtZGVzYyAiVXBncmFkZSBWQyBwYWNrYWdlOiAiIHQpKSkKICAg OzsgSEFDSzogVG8gcnVuIGBwYWNrYWdlLXZjLS11bnBhY2stMScgYWZ0ZXIgY2hlY2tpbmcg b3V0IHRoZSBuZXcKICAgOzsgcmV2aXNpb24sIHdlIGluc2VydCBhIGhvb2sgaW50byBgdmMt cG9zdC1jb21tYW5kLWZ1bmN0aW9ucycsIGFuZAogICA7OyByZW1vdmUgaXQgcmlnaHQgYWZ0 ZXIgaXQgcmFuLiAgVG8gYXZvaWQgcnVubmluZyB0aGUgaG9vayBtdWx0aXBsZQpAQCAtODcw LDcgKzg3MCw3IEBAIHBhY2thZ2UtdmMtcmVidWlsZAogY29va2llcywgcmUtY29tcGlsaW5n IEVtYWNzIExpc3AgZmlsZXMsIGJ1aWxkaW5nIGFuZCBpbnN0YWxsaW5nCiBhbnkgZG9jdW1l bnRhdGlvbiwgZG93bmxvYWRpbmcgYW55IG1pc3NpbmcgZGVwZW5kZW5jaWVzLiAgVGhpcwog Y29tbWFuZCBkb2VzIG5vdCBmZXRjaCBuZXcgcmV2aXNpb25zIGZyb20gYSByZW1vdGUgc2Vy dmVyLiAgVGhhdAotaXMgdGhlIHJlc3BvbnNpYmlsaXR5IG9mIGBwYWNrYWdlLXZjLXVwZGF0 ZScuICBJbnRlcmFjdGl2ZWx5LAoraXMgdGhlIHJlc3BvbnNpYmlsaXR5IG9mIGBwYWNrYWdl LXZjLXVwZ3JhZGUnLiAgSW50ZXJhY3RpdmVseSwKIHByb21wdCBmb3IgdGhlIG5hbWUgb2Yg dGhlIHBhY2thZ2UgdG8gcmVidWlsZC4iCiAgIChpbnRlcmFjdGl2ZSAobGlzdCAocGFja2Fn ZS12Yy0tcmVhZC1wYWNrYWdlLWRlc2MgIlJlYnVpbGQgcGFja2FnZTogIiB0KSkpCiAgIChw YWNrYWdlLXZjLS11bnBhY2stMSBwa2ctZGVzYyAocGFja2FnZS1kZXNjLWRpciBwa2ctZGVz YykpKQpkaWZmIC0tZ2l0IGEvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UuZWwgYi9saXNwL2Vt YWNzLWxpc3AvcGFja2FnZS5lbAppbmRleCBmZmE2MjcyZGQxZi4uZTE1NTM2YzlmNTAgMTAw NjQ0Ci0tLSBhL2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLmVsCisrKyBiL2xpc3AvZW1hY3Mt bGlzcC9wYWNrYWdlLmVsCkBAIC0yMjYzLDI0ICsyMjYzLDI0IEBAIHBhY2thZ2UtaW5zdGFs bAogICAgICAgICAgIChtZXNzYWdlICAiUGFja2FnZSBgJXMnIGluc3RhbGxlZC4iIG5hbWUp KQogICAgICAgKG1lc3NhZ2UgImAlcycgaXMgYWxyZWFkeSBpbnN0YWxsZWQiIG5hbWUpKSkp CiAKLShkZWNsYXJlLWZ1bmN0aW9uIHBhY2thZ2UtdmMtdXBkYXRlICJwYWNrYWdlLXZjIiAo cGtnKSkKKyhkZWNsYXJlLWZ1bmN0aW9uIHBhY2thZ2UtdmMtdXBncmFkZSAicGFja2FnZS12 YyIgKHBrZykpCiAKIDs7OyMjI2F1dG9sb2FkCi0oZGVmdW4gcGFja2FnZS11cGRhdGUgKG5h bWUpCi0gICJVcGRhdGUgcGFja2FnZSBOQU1FIGlmIGEgbmV3ZXIgdmVyc2lvbiBleGlzdHMu IgorKGRlZnVuIHBhY2thZ2UtdXBncmFkZSAobmFtZSkKKyAgIlVwZ3JhZGUgcGFja2FnZSBO QU1FIGlmIGEgbmV3ZXIgdmVyc2lvbiBleGlzdHMuIgogICAoaW50ZXJhY3RpdmUKICAgIChs aXN0IChjb21wbGV0aW5nLXJlYWQKLSAgICAgICAgICAiVXBkYXRlIHBhY2thZ2U6ICIgKHBh Y2thZ2UtLXVwZGF0ZWFibGUtcGFja2FnZXMpIG5pbCB0KSkpCisgICAgICAgICAgIlVwZ3Jh ZGUgcGFja2FnZTogIiAocGFja2FnZS0tdXBncmFkZWFibGUtcGFja2FnZXMpIG5pbCB0KSkp CiAgIChsZXQqICgocGFja2FnZSAoaWYgKHN5bWJvbHAgbmFtZSkKICAgICAgICAgICAgICAg ICAgICAgICBuYW1lCiAgICAgICAgICAgICAgICAgICAgIChpbnRlcm4gbmFtZSkpKQogICAg ICAgICAgKHBrZy1kZXNjIChjYWRyIChhc3NxIHBhY2thZ2UgcGFja2FnZS1hbGlzdCkpKSkK ICAgICAoaWYgKHBhY2thZ2UtdmMtcCBwa2ctZGVzYykKLSAgICAgICAgKHBhY2thZ2UtdmMt dXBkYXRlIHBrZy1kZXNjKQorICAgICAgICAocGFja2FnZS12Yy11cGdyYWRlIHBrZy1kZXNj KQogICAgICAgKHBhY2thZ2UtZGVsZXRlIHBrZy1kZXNjICdmb3JjZSkKICAgICAgIChwYWNr YWdlLWluc3RhbGwgcGFja2FnZSAnZG9udC1zZWxlY3QpKSkpCiAKLShkZWZ1biBwYWNrYWdl LS11cGRhdGVhYmxlLXBhY2thZ2VzICgpCisoZGVmdW4gcGFja2FnZS0tdXBncmFkZWFibGUt cGFja2FnZXMgKCkKICAgOzsgSW5pdGlhbGl6ZSB0aGUgcGFja2FnZSBzeXN0ZW0gdG8gZ2V0 IHRoZSBsaXN0IG9mIHBhY2thZ2UKICAgOzsgc3ltYm9scyBmb3IgY29tcGxldGlvbi4KICAg KHBhY2thZ2UtLWFyY2hpdmVzLWluaXRpYWxpemUpCkBAIC0yMjk4LDIzICsyMjk4LDIzIEBA IHBhY2thZ2UtLXVwZGF0ZWFibGUtcGFja2FnZXMKICAgICBwYWNrYWdlLWFsaXN0KSkpCiAK IDs7OyMjI2F1dG9sb2FkCi0oZGVmdW4gcGFja2FnZS11cGRhdGUtYWxsICgmb3B0aW9uYWwg cXVlcnkpCisoZGVmdW4gcGFja2FnZS11cGdyYWRlLWFsbCAoJm9wdGlvbmFsIHF1ZXJ5KQog ICAiUmVmcmVzaCBwYWNrYWdlIGxpc3QgYW5kIHVwZ3JhZGUgYWxsIHBhY2thZ2VzLgotSWYg UVVFUlksIGFzayB0aGUgdXNlciBiZWZvcmUgdXBkYXRpbmcgcGFja2FnZXMuICBXaGVuIGNh bGxlZAorSWYgUVVFUlksIGFzayB0aGUgdXNlciBiZWZvcmUgdXBncmFkaW5nIHBhY2thZ2Vz LiAgV2hlbiBjYWxsZWQKIGludGVyYWN0aXZlbHksIFFVRVJZIGlzIGFsd2F5cyB0cnVlLiIK ICAgKGludGVyYWN0aXZlIChsaXN0IChub3Qgbm9uaW50ZXJhY3RpdmUpKSkKICAgKHBhY2th Z2UtcmVmcmVzaC1jb250ZW50cykKLSAgKGxldCAoKHVwZGF0ZWFibGUgKHBhY2thZ2UtLXVw ZGF0ZWFibGUtcGFja2FnZXMpKSkKLSAgICAoaWYgKG5vdCB1cGRhdGVhYmxlKQotICAgICAg ICAobWVzc2FnZSAiTm8gcGFja2FnZXMgdG8gdXBkYXRlIikKKyAgKGxldCAoKHVwZ3JhZGVh YmxlIChwYWNrYWdlLS11cGdyYWRlYWJsZS1wYWNrYWdlcykpKQorICAgIChpZiAobm90IHVw Z3JhZGVhYmxlKQorICAgICAgICAobWVzc2FnZSAiTm8gcGFja2FnZXMgdG8gdXBncmFkZSIp CiAgICAgICAod2hlbiAoYW5kIHF1ZXJ5CiAgICAgICAgICAgICAgICAgIChub3QgKHllcy1v ci1uby1wCi0gICAgICAgICAgICAgICAgICAgICAgIChpZiAobGVuZ3RoPSB1cGRhdGVhYmxl IDEpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAiT25lIHBhY2thZ2UgdG8gdXBkYXRl LiAgRG8gaXQ/ICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAoZm9ybWF0ICIlcyBwYWNr YWdlcyB0byB1cGRhdGUuICBEbyBpdD8iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAobGVuZ3RoIHVwZGF0ZWFibGUpKSkpKSkKLSAgICAgICAgKHVzZXItZXJyb3IgIlVw ZGF0aW5nIGFib3J0ZWQiKSkKLSAgICAgIChtYXBjICMncGFja2FnZS11cGRhdGUgdXBkYXRl YWJsZSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgKGlmIChsZW5ndGg9IHVwZ3JhZGVh YmxlIDEpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAiT25lIHBhY2thZ2UgdG8gdXBn cmFkZS4gIERvIGl0PyAiCisgICAgICAgICAgICAgICAgICAgICAgICAgKGZvcm1hdCAiJXMg cGFja2FnZXMgdG8gdXBncmFkZS4gIERvIGl0PyIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChsZW5ndGggdXBncmFkZWFibGUpKSkpKSkKKyAgICAgICAgKHVzZXItZXJy b3IgIlVwZ3JhZGUgYWJvcnRlZCIpKQorICAgICAgKG1hcGMgIydwYWNrYWdlLXVwZ3JhZGUg dXBncmFkZWFibGUpKSkpCiAKIChkZWZ1biBwYWNrYWdlLS1kZXBlbmRlbmNpZXMgKHBrZykK ICAgIlJldHVybiBhIGxpc3Qgb2YgYWxsIGRlcGVuZGVuY2llcyBQS0cgaGFzLgotLSAKMi4z Ny4yCgo= --------------Yu2QB9bjll9000lxj9p0OPop--