From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#62720: 29.0.60; Not easy at all to upgrade :core packages like Eglot Date: Mon, 10 Apr 2023 18:13:50 +0000 Message-ID: <87y1mz38rl.fsf@posteo.net> References: <87a5zj2vfo.fsf@gmail.com> <87wn2modrm.fsf@posteo.net> <87ile6o2ov.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2781"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 62720@debbugs.gnu.org, Stefan Monnier To: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Apr 10 20:14:25 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 1plw24-0000WU-Co for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 10 Apr 2023 20:14:24 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plw1p-0001HG-PN; Mon, 10 Apr 2023 14:14:09 -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 1plw1j-0001GC-2H for bug-gnu-emacs@gnu.org; Mon, 10 Apr 2023 14:14:03 -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 1plw1i-0007QM-9F for bug-gnu-emacs@gnu.org; Mon, 10 Apr 2023 14:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plw1i-0006X3-47 for bug-gnu-emacs@gnu.org; Mon, 10 Apr 2023 14:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Apr 2023 18:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62720 X-GNU-PR-Package: emacs Original-Received: via spool by 62720-submit@debbugs.gnu.org id=B62720.168115041025064 (code B ref 62720); Mon, 10 Apr 2023 18:14:02 +0000 Original-Received: (at 62720) by debbugs.gnu.org; 10 Apr 2023 18:13:30 +0000 Original-Received: from localhost ([127.0.0.1]:35882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plw1C-0006WC-8t for submit@debbugs.gnu.org; Mon, 10 Apr 2023 14:13:30 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:48363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plw1A-0006Vy-ER for 62720@debbugs.gnu.org; Mon, 10 Apr 2023 14:13:29 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4EEE824026C for <62720@debbugs.gnu.org>; Mon, 10 Apr 2023 20:13:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681150402; bh=E/somDT+EfRoKCquKOkqyy50qOdeGTbsStfWnQeNeg8=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=otUelVP0T5w3FuPx0O+oJwC/jCX1WR10Uvs1nDEssj1hU4mIBrnVa9klOqz+OMw13 RrnU/PVk42iE+KkeWIYBy/GTWZ+0qALUXiHSWW2enpRDyUaYgOSDt236QuvQqROau2 OOmTmUymGmlyzFYALaD6sBIXIrlrmURf7D6wk+MRFtkMRzwtVOh/oWIzPVyqkMiNxB f8pPxjl51PyY6O0kBruyC32HlNtBr3s96gGwInmWw2bPlQojn9eHaiMdmmN5fTfJWA N8PdLBIiBQJvjt7YenMZtHEixETgQY/9C+SNrL+ZOSiPhMNeyaJhBw7PufF4dweyGP h2dFxMLvsj3SQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PwHCP3gxnz6tsB; Mon, 10 Apr 2023 20:13:21 +0200 (CEST) In-Reply-To: ("=?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?="'s message of "Mon, 10 Apr 2023 17:01:31 +0100") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM 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:259593 Archived-At: Jo=C3=A3o T=C3=A1vora writes: > On Sat, Apr 8, 2023 at 4:45=E2=80=AFPM Stefan Monnier wrote: >> >> > As package-update just defers to package-install, I don't find this >> > surprising. What you want is that package.el always treats a built-in >> > package as upgradable to a package from ELPA. It seems like this shou= ld >> > be possible by adjusting the interactive spec of package-install and >> > modifying package-compute-transaction or even package-built-in-p. >> >> I agree, tho I don't understand why you say "built-in" above. Isn't the >> problem also present for already-installed-but-out-of-date ELPA packages? > > I bit the bullet and went after this in package.el. The answer is no, > it's not present for those packages. > > But Philip's imagined fix seems to be more complicated than it needs > to be. Here's a simple patch that works well in my tests. It makes > M-x package-update also update built-in-packages. > > diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el > index f92afe56b76..f54b6f39e40 100644 > --- a/lisp/emacs-lisp/package.el > +++ b/lisp/emacs-lisp/package.el > @@ -2243,11 +2243,16 @@ package-update > (let* ((package (if (symbolp name) > name > (intern name))) > - (pkg-desc (cadr (assq package package-alist)))) > - (if (package-vc-p pkg-desc) > - (package-vc-update pkg-desc) > - (package-delete pkg-desc 'force) > - (package-install package 'dont-select)))) > + (nonbuiltin (assq package package-alist))) > + (cond (nonbuiltin > + (let ((desc (cadr nonbuiltin))) > + (if (package-vc-p desc) > + (package-vc-update desc) > + (package-delete desc 'force) > + (package-install package 'dont-select)))) > + (t > + (package-install > + (cadr (assq package package-archive-contents))))))) > > (defun package--updateable-packages () > ;; Initialize the package system to get the list of package > @@ -2261,10 +2266,14 @@ package--updateable-packages > (assq (car elt) package-archive-contents))) > (and available > (version-list-< > - (package-desc-version (cadr elt)) > + (if (vectorp (cdr elt)) (aref (cdr elt) 0) > + (package-desc-version (cadr elt))) > (package-desc-version (cadr available))))) > - (package-vc-p (cadr (assq (car elt) package-alist))))) > - package-alist))) > + (and (consp (cdr elt)) > + (package-desc-p (cadr elt)) > + (package-vc-p (cadr elt))))) > + (seq-union package-alist package--builtins > + (lambda (a b) (eq (car a) (car b))))))) Will this not affect `package-update-all'? I don't if we want that the command installs all packages from ELPA that it can find. > ;;;###autoload > (defun package-update-all (&optional query) > > The only thing that's slightly inelegant/hard-to-follow is that > the format of package-alist is different than package--builtins. > Lots of consp, cdr-taking, vectorp and so on. Besides that, it's > a question of taking the union of the two sets and operating on that. That is necessary complexity, so I don't think there is any way around it. > This also relies on seq-union's undocumented behavior of keeping > the first of any duplicates. Feel free to rewrite. > > Jo=C3=A3o