emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 7bc7b6b4dd 1/2: ; Partial revert of f3e7820b


From: Philip Kaludercic
Subject: emacs-29 7bc7b6b4dd 1/2: ; Partial revert of f3e7820b
Date: Sun, 25 Dec 2022 03:40:22 -0500 (EST)

branch: emacs-29
commit 7bc7b6b4dd9dde10d08eb421a98f6d19fcfbfa1a
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    ; 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 4d33311cb7..73c4f896a4 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]