From: Philip Kaludercic <philipk@posteo.net>
To: Stefan Kangas <stefankangas@gmail.com>
Cc: Andrey Samsonov <samsonov.box@gmail.com>,
Eli Zaretskii <eliz@gnu.org>, Eshel Yaron <me@eshelyaron.com>,
Stefan Monnier <monnier@iro.umontreal.ca>,
65475@debbugs.gnu.org
Subject: bug#65475: 29.1; package-selected-packages variable is not updated when the last package is deleted
Date: Sun, 10 Sep 2023 11:57:38 +0000 [thread overview]
Message-ID: <87fs3mxmtp.fsf@posteo.net> (raw)
In-Reply-To: <CADwFkmkDMR2_BowxuWt9GpUn+L+bddTAW0qdSSq5WvpveGsNTQ@mail.gmail.com> (Stefan Kangas's message of "Tue, 5 Sep 2023 15:03:23 -0700")
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
Stefan Kangas <stefankangas@gmail.com> writes:
> reopen 65475
> thanks
>
> Eshel Yaron <me@eshelyaron.com> writes:
>
>>>> FWIW, I get the same non-empty `package-selected-packages` with Emacs
>>>> master built from source. Indeed it looks like this issue isn't fully
>>>> fixed yet.
>>>
>>> Even if 610105ee81bbf79f72d4efb46d0caddf8d654cf1 was applied?
>>
>> Of course.
>
> Thanks for testing. I'm reopening the bug.
Following Eshel's diagnosis, it seems it should be possible to solve the
bug by dynamically binding package-alist without the deleted package and
then updating the top-level value if everything went right:
[-- Attachment #2: Type: text/plain, Size: 4426 bytes --]
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 3a019905960..ed7d666ebf4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2533,42 +2533,44 @@ package-delete
;; upgraded package.
(package--newest-p pkg-desc))
(package--save-selected-packages (remove name package-selected-packages)))
- (cond ((not (string-prefix-p (file-name-as-directory
- (expand-file-name package-user-dir))
- (expand-file-name dir)))
- ;; Don't delete "system" packages.
- (error "Package `%s' is a system package, not deleting"
- (package-desc-full-name pkg-desc)))
- ((and (null force)
- (setq pkg-used-elsewhere-by
- (package--used-elsewhere-p pkg-desc)))
- ;; Don't delete packages used as dependency elsewhere.
- (error "Package `%s' is used by `%s' as dependency, not deleting"
- (package-desc-full-name pkg-desc)
- (package-desc-name pkg-used-elsewhere-by)))
- (t
- (add-hook 'post-command-hook #'package-menu--post-refresh)
- (package--delete-directory dir)
- ;; Remove NAME-VERSION.signed and NAME-readme.txt files.
- ;;
- ;; NAME-readme.txt files are no longer created, but they
- ;; may be left around from an earlier install.
- (dolist (suffix '(".signed" "readme.txt"))
- (let* ((version (package-version-join (package-desc-version pkg-desc)))
- (file (concat (if (string= suffix ".signed")
- dir
- (substring dir 0 (- (length version))))
- suffix)))
- (when (file-exists-p file)
- (delete-file file))))
- ;; Update package-alist.
+ (let ((package-alist ;see bug#65475
(let ((pkgs (assq name package-alist)))
- (delete pkg-desc pkgs)
- (unless (cdr pkgs)
- (setq package-alist (delq pkgs package-alist))))
- (package--quickstart-maybe-refresh)
- (message "Package `%s' deleted."
- (package-desc-full-name pkg-desc))))))
+ (if (null (remove pkg-desc (cdr pkgs)))
+ (remq pkgs package-alist)
+ package-alist))))
+ (cond ((not (string-prefix-p (file-name-as-directory
+ (expand-file-name package-user-dir))
+ (expand-file-name dir)))
+ ;; Don't delete "system" packages.
+ (error "Package `%s' is a system package, not deleting"
+ (package-desc-full-name pkg-desc)))
+ ((and (null force)
+ (setq pkg-used-elsewhere-by
+ (package--used-elsewhere-p pkg-desc)))
+ ;; Don't delete packages used as dependency elsewhere.
+ (error "Package `%s' is used by `%s' as dependency, not deleting"
+ (package-desc-full-name pkg-desc)
+ (package-desc-name pkg-used-elsewhere-by)))
+ (t
+ (add-hook 'post-command-hook #'package-menu--post-refresh)
+ (package--delete-directory dir)
+ ;; Remove NAME-VERSION.signed and NAME-readme.txt files.
+ ;;
+ ;; NAME-readme.txt files are no longer created, but they
+ ;; may be left around from an earlier install.
+ (dolist (suffix '(".signed" "readme.txt"))
+ (let* ((version (package-version-join (package-desc-version pkg-desc)))
+ (file (concat (if (string= suffix ".signed")
+ dir
+ (substring dir 0 (- (length version))))
+ suffix)))
+ (when (file-exists-p file)
+ (delete-file file))))
+ ;; Update package-alist.
+ (set-default-toplevel-value 'package-alist package-alist)
+ (package--quickstart-maybe-refresh)
+ (message "Package `%s' deleted."
+ (package-desc-full-name pkg-desc)))))))
;;;###autoload
(defun package-reinstall (pkg)
[-- Attachment #3: Type: text/plain, Size: 142 bytes --]
An alternative solution might just be to manually add a check at the end
of package-delete to handle the proper removal of the last package.
next prev parent reply other threads:[~2023-09-10 11:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 12:02 bug#65475: 29.1; package-selected-packages variable is not updated when the last package is deleted Andrey Samsonov
2023-08-26 7:16 ` Eli Zaretskii
2023-08-26 7:30 ` Philip Kaludercic
2023-08-26 11:57 ` Stefan Kangas
2023-08-26 12:02 ` Philip Kaludercic
2023-08-26 12:07 ` Stefan Kangas
2023-09-02 16:28 ` Stefan Kangas
2023-09-04 3:24 ` Andrey Samsonov
2023-09-04 7:35 ` Eshel Yaron via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-05 17:10 ` Philip Kaludercic
2023-09-05 17:39 ` Eshel Yaron via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-05 22:03 ` Stefan Kangas
2023-09-10 11:57 ` Philip Kaludercic [this message]
2023-09-11 2:42 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-13 10:01 ` Philip Kaludercic
2023-09-13 14:35 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-13 14:41 ` Stefan Kangas
2023-09-14 13:09 ` Philip Kaludercic
2023-09-14 14:27 ` Stefan Kangas
2023-09-15 7:41 ` Philip Kaludercic
2023-09-21 16:31 ` Philip Kaludercic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fs3mxmtp.fsf@posteo.net \
--to=philipk@posteo.net \
--cc=65475@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=me@eshelyaron.com \
--cc=monnier@iro.umontreal.ca \
--cc=samsonov.box@gmail.com \
--cc=stefankangas@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).