mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-02 02:10:46 -08:00
Code Issues Projects Releases Wiki Activity

; Fix test resulting from 5744519e

Browse source 
* lisp/emacs-lisp/package.el (package-install): Delete dead code
resulting from previous change.
* test/lisp/emacs-lisp/package-tests.el
(package-test-install-single): Adjust code to expect
'user-error'
This commit is contained in:
Philip Kaludercic 2025-12-23 00:12:39 +01:00
parent e1f87081d4
commit 4771cd2e58
No known key found for this signature in database
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/emacs-lisp/package.el
View file

@ -2280,15 +2280,15 @@ had been enabled."
nil t))
nil)))
(cl-check-type pkg (or symbol package-desc))
(when (or (and package-install-upgrade-built-in
(package--active-built-in-p pkg))
(package-installed-p pkg))
(user-error "Package is already installed"))
(package--archives-initialize)
(add-hook 'post-command-hook #'package-menu--post-refresh)
(let ((name (if (package-desc-p pkg)
(package-desc-name pkg)
pkg)))
(when (or (and package-install-upgrade-built-in
(package--active-built-in-p pkg))
(package-installed-p pkg))
(user-error "`%s' is already installed" name))
(unless (or dont-select (package--user-selected-p name))
(package--save-selected-packages
(cons name package-selected-packages)))
@ -2304,8 +2304,8 @@ had been enabled."
(progn
(package-download-transaction transaction)
(package--quickstart-maybe-refresh)
(message "Package `%s' installed." name))
(message "`%s' is already installed" name))))
(message "Package `%s' installed." name)))))
(declare-function package-vc-upgrade "package-vc" (pkg))

4
test/lisp/emacs-lisp/package-tests.el
View file

@ -241,7 +241,9 @@ Must called from within a `tar-mode' buffer."
(package-initialize)
(should (package-installed-p 'simple-single))
;; Check if we properly report an "already installed".
(should-error (package-install 'simple-single) :type 'user-error)
(should (condition-case nil
(progn (package-install 'simple-single) nil)
(user-error t)))
(should (package-installed-p 'simple-single))
(let* ((simple-pkg-dir (file-name-as-directory
(expand-file-name