From 7bc7b6b4dd9dde10d08eb421a98f6d19fcfbfa1a Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Mon, 19 Dec 2022 17:00:36 +0100 Subject: [PATCH] ; 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 --- lisp/emacs-lisp/package.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.39.2