From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#62720: 29.0.60; Not easy at all to upgrade :core packages like Eglot Date: Thu, 13 Apr 2023 11:11:02 +0300 Message-ID: <834jpk5hih.fsf@gnu.org> References: <87a5zj2vfo.fsf@gmail.com> <83pm898xb9.fsf@gnu.org> <87h6tlleg0.fsf@gmail.com> <8335558qc7.fsf@gnu.org> <83sfd5761f.fsf@gnu.org> <87zg7djrgr.fsf@gmail.com> <83o7nt73za.fsf@gnu.org> <83mt3d73c2.fsf@gnu.org> <87r0sptinq.fsf@posteo.net> <83jzyh706c.fsf@gnu.org> <875ya1tdwf.fsf@posteo.net> <83edop6sdy.fsf@gnu.org> <831qkp6o0i.fsf@gnu.org> <83wn2h5825.fsf@gnu.org> <87wn2gkhzr.fsf@posteo.net> <83cz485oxi.fsf@gnu.org> <87leiwdyff.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9701"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 62720@debbugs.gnu.org, joaotavora@gmail.com, monnier@iro.umontreal.ca To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Apr 13 10:11:17 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 1pms32-0002Md-Go for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 13 Apr 2023 10:11:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pms2s-0004Rl-SO; Thu, 13 Apr 2023 04:11:07 -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 1pms2q-0004P2-Dm for bug-gnu-emacs@gnu.org; Thu, 13 Apr 2023 04:11:04 -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 1pms2o-0005cL-U4 for bug-gnu-emacs@gnu.org; Thu, 13 Apr 2023 04:11:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pms2o-0005tv-Fp for bug-gnu-emacs@gnu.org; Thu, 13 Apr 2023 04:11:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 13 Apr 2023 08:11: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.168137343122646 (code B ref 62720); Thu, 13 Apr 2023 08:11:02 +0000 Original-Received: (at 62720) by debbugs.gnu.org; 13 Apr 2023 08:10:31 +0000 Original-Received: from localhost ([127.0.0.1]:42489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pms2J-0005tB-74 for submit@debbugs.gnu.org; Thu, 13 Apr 2023 04:10:31 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:38858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pms2G-0005sw-5h for 62720@debbugs.gnu.org; Thu, 13 Apr 2023 04:10:30 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pms2A-0005H2-Dx; Thu, 13 Apr 2023 04:10:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=MSc3FPpclkZ7M0EWL2BL1LJfIHCXZ8h8BnAv0UNlEGU=; b=gi5k2NP+shn6r//w17ki 2aIc8UOpIQ++xlpdhF47fAGg31Ks6+Bux17DjyH/FD7ZyiZmomvY5w/x18SthSDYo56KDSJfZz9kG uoz/lb+4dfTeBbmihudvMMxP/mg1QnpG2r8TuFNKlBPNGB7l2YVuFiC2aRPaEA0QPCgfXaTfEqQ5j aQ11xnbZwm3nldqqDKz76oXhGeVOVDaY/ndvjKJvxusLJtKFqZQ41PmNtS/jY8uYwOPArE2x9SMlw 0Yf6wRCDA4UwyZwuXG3wx6BwMuN1vfyz0ETk4Wkj/+biLZ+LXMLW93/yE7gq8wmHxpfpeN1XmdsRj tB7t0kjNJTLeOg==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pms24-0007MS-DC; Thu, 13 Apr 2023 04:10:17 -0400 In-Reply-To: <87leiwdyff.fsf@posteo.net> (message from Philip Kaludercic on Thu, 13 Apr 2023 07:38:28 +0000) 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:259840 Archived-At: > From: Philip Kaludercic > Cc: joaotavora@gmail.com, monnier@iro.umontreal.ca, 62720@debbugs.gnu.org, > larsi@gnus.org > Date: Thu, 13 Apr 2023 07:38:28 +0000 > > > Thanks. This is almost on-target, but it modifies > > package-compute-transaction. Is that necessary? > > I have found an alternative that doesn't change the way > `package-compute-transaction' works, but requires a small change in > `package-install': Thanks. > @@ -2205,11 +2218,13 @@ package-install > (package--archives-initialize) > (list (intern (completing-read > "Install package: " > - (delq nil > - (mapcar (lambda (elt) > - (unless (package-installed-p (car elt)) > - (symbol-name (car elt)))) > - package-archive-contents)) > + (mapcan > + (lambda (elt) > + (and (or (and current-prefix-arg > + (package--upgradable-built-in-p (car elt))) > + (not (package-installed-p (car elt)))) > + (list (car elt)))) > + package-archive-contents) Why did the original code use symbol-name, but the new one doesn't? > @@ -2221,11 +2236,16 @@ package-install > (package--save-selected-packages > (cons name package-selected-packages))) > (if-let* ((transaction > - (if (package-desc-p pkg) > - (unless (package-installed-p pkg) > - (package-compute-transaction (list pkg) > - (package-desc-reqs pkg))) > - (package-compute-transaction () (list (list pkg)))))) > + (cond > + ((package--upgradable-built-in-p pkg) > + (let ((desc (cadr (assq name package-archive-contents)))) > + (package-compute-transaction > + (list desc) (package-desc-reqs desc)))) > + ((package-desc-p pkg) > + (and (not (package-installed-p pkg)) > + (package-compute-transaction > + (list pkg) (package-desc-reqs pkg)))) > + ((package-compute-transaction () (list (list pkg))))))) I think the first condition of 'cond' should be ((and current-prefix-arg (package--upgradable-built-in-p pkg)) to make sure we don't affect the non-prefix-arg invocations in any way. > Note that (package-install 'eglot) does download code, but I believe > that this is the correct approach and would align with what João > wanted. I'm not sure I follow: which code does the above download?