From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 19 Dec 2022 16:00:36 +0000 (+0100)
Subject: ; Partial revert of f3e7820b
X-Git-Tag: emacs-29.0.90~1004
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7bc7b6b4dd9dde10d08eb421a98f6d19fcfbfa1a;p=emacs.git

; 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
---

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)