diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-12-19 17:00:36 +0100 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-12-25 09:36:01 +0100 |
| commit | 7bc7b6b4dd9dde10d08eb421a98f6d19fcfbfa1a (patch) | |
| tree | d3e4868dfd44ca7e60d00273a6385662c16f95db /lisp/emacs-lisp | |
| parent | 2cec78254ea7f85180748a4fe3fab6eb07982b2f (diff) | |
| download | emacs-7bc7b6b4dd9dde10d08eb421a98f6d19fcfbfa1a.tar.gz emacs-7bc7b6b4dd9dde10d08eb421a98f6d19fcfbfa1a.tar.bz2 emacs-7bc7b6b4dd9dde10d08eb421a98f6d19fcfbfa1a.zip | |
; 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
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 4d33311cb74..73c4f896a49 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2094,7 +2094,7 @@ if all the in-between dependencies are also in PACKAGE-LIST." (defun package-install-from-archive (pkg-desc) "Download and install a package defined by PKG-DESC." ;; 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")) (let* ((location (package-archive-base pkg-desc)) (file (concat (package-desc-full-name pkg-desc) |