From: Philip Kaludercic <philipk@posteo.net>
Date: Tue, 15 Nov 2022 13:36:26 +0000 (+0100)
Subject: Remove duplicate package descriptions after updating
X-Git-Tag: emacs-29.0.90~1616^2~65
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=228c247e6ff79b5aeb4cf65911fdea60d1f8edcf;p=emacs.git

Remove duplicate package descriptions after updating

* lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): Ensure there
is always just one instance of a package description in 'package-alist'.
---

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index bf8deb20244..368667814c4 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -386,6 +386,11 @@ This includes downloading missing dependencies, generating
 autoloads, generating a package description file (used to
 identify a package as a source package later on), building
 documentation and marking the package as installed."
+  ;; Remove any previous instance of PKG-DESC from `package-alist'
+  (let ((pkgs (assq (package-desc-name pkg-desc) package-alist)))
+    (when pkgs
+      (setf (cdr pkgs) (delq pkg-desc (cdr pkgs)))))
+
   ;; In case the package was installed directly from source, the
   ;; dependency list wasn't know beforehand, and they might have
   ;; to be installed explicitly.