; Partial revert of f3e7820b
* lisp/emacs-lisp/package.el (package-install-from-archive): Check if a package is a directory package, not a VC package
This commit is contained in:
parent
2cec78254e
commit
7bc7b6b4dd
1 changed files with 1 additions and 1 deletions
|
@ -2094,7 +2094,7 @@ if all the in-between dependencies are also in PACKAGE-LIST."
|
||||||
(defun package-install-from-archive (pkg-desc)
|
(defun package-install-from-archive (pkg-desc)
|
||||||
"Download and install a package defined by PKG-DESC."
|
"Download and install a package defined by PKG-DESC."
|
||||||
;; This won't happen, unless the archive is doing something wrong.
|
;; This won't happen, unless the archive is doing something wrong.
|
||||||
(when (package-vc-p pkg-desc)
|
(when (eq (package-desc-kind pkg-desc) 'dir)
|
||||||
(error "Can't install directory package from archive"))
|
(error "Can't install directory package from archive"))
|
||||||
(let* ((location (package-archive-base pkg-desc))
|
(let* ((location (package-archive-base pkg-desc))
|
||||||
(file (concat (package-desc-full-name pkg-desc)
|
(file (concat (package-desc-full-name pkg-desc)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue