From: Philip Kaludercic <philipk@posteo.net>
Date: Tue, 10 Dec 2024 21:12:34 +0000 (+0100)
Subject: Revert "Attempt to install package first when upgrading"
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f8d36d76a9fa81104a5469d2dececb913f98ec6;p=emacs.git

Revert "Attempt to install package first when upgrading"

This reverts commit 3d8e49c41a66a7f05cb96f84e2a10f0f308ac9ca.

(cherry picked from commit dffd4a50c64db5141997ad91e04d9e2107d968b5)
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 31df3c2cc44..7a8e5a685d9 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2268,16 +2268,12 @@ had been enabled."
     ;; `pkg-desc' will be nil when the package is an "active built-in".
     (if (and pkg-desc (package-vc-p pkg-desc))
         (package-vc-upgrade pkg-desc)
+      (when pkg-desc
+        (package-delete pkg-desc 'force 'dont-unselect))
       (package-install package
                        ;; An active built-in has never been "selected"
                        ;; before.  Mark it as installed explicitly.
-                       (and pkg-desc 'dont-select))
-      ;; We delete the old package via the descriptor after installing
-      ;; the new package to avoid losing the package if there issues
-      ;; during installation (Bug#74556).
-      (when pkg-desc
-        (cl-assert (package-desc-dir pkg-desc))
-        (package-delete pkg-desc 'force 'dont-unselect)))))
+                       (and pkg-desc 'dont-select)))))
 
 (defun package--upgradeable-packages (&optional include-builtins)
   ;; Initialize the package system to get the list of package