[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/package-vc-fixes 6b35279259 45/48: Fix issues related to 'packag
From: |
Philip Kaludercic |
Subject: |
scratch/package-vc-fixes 6b35279259 45/48: Fix issues related to 'package-vc-install-from-checkout' |
Date: |
Wed, 16 Nov 2022 04:50:10 -0500 (EST) |
branch: scratch/package-vc-fixes
commit 6b3527925921c7e4afa1f0e702a9ebeb9e6b311e
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
Fix issues related to 'package-vc-install-from-checkout'
* lisp/emacs-lisp/package-vc.el (package-vc--main-file): Ensure the
package name is a string.
(package-vc--unpack-1): Use pkg-dir instead of the empty return value
of 'package-lisp-dir'.
(package-vc-install-from-checkout): Fix file name handling.
---
lisp/emacs-lisp/package-vc.el | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 46114412df..b201c9d150 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -297,15 +297,14 @@ asynchronously."
(defun package-vc--main-file (pkg-desc)
"Return the name of the main file for PKG-DESC."
(cl-assert (package-vc-p pkg-desc))
- (let ((pkg-spec (package-vc--desc->spec pkg-desc)))
+ (let ((pkg-spec (package-vc--desc->spec pkg-desc))
+ (name (symbol-name (package-desc-name pkg-desc))))
(or (plist-get pkg-spec :main-file)
(expand-file-name
- (format "%s.el" (package-desc-name pkg-desc))
+ (concat name ".el")
(file-name-concat
(or (package-desc-dir pkg-desc)
- (expand-file-name
- (package-desc-name pkg-desc)
- package-user-dir))
+ (expand-file-name name package-user-dir))
(plist-get pkg-spec :lisp-dir))))))
(defun package-vc--generate-description-file (pkg-desc pkg-file)
@@ -397,8 +396,8 @@ documentation and marking the package as installed."
;; In case the package was installed directly from source, the
;; dependency list wasn't know beforehand, and they might have
;; to be installed explicitly.
- (let (deps)
- (dolist (file (directory-files (package-lisp-dir pkg-desc) t "\\.el\\'" t))
+ (let ((deps '()))
+ (dolist (file (directory-files pkg-dir t "\\.el\\'" t))
(with-temp-buffer
(insert-file-contents file)
(when-let* ((require-lines (lm-header-multiline "package-requires")))
@@ -731,11 +730,12 @@ name from the base name of DIR."
(package-vc--archives-initialize)
(let* ((name (or name (file-name-base (directory-file-name dir))))
(pkg-dir (expand-file-name name package-user-dir)))
- (make-symbolic-link dir pkg-dir)
- (package-vc--unpack-1 (package-desc-create
- :name (intern name)
- :kind 'vc)
- pkg-dir)))
+ (make-symbolic-link (expand-file-name dir) pkg-dir)
+ (package-vc--unpack-1
+ (package-desc-create
+ :name (intern name)
+ :kind 'vc)
+ (file-name-as-directory pkg-dir))))
;;;###autoload
(defun package-vc-rebuild (pkg-desc)
- scratch/package-vc-fixes 685b4b274b 08/48: Fix the docstring for 'package-vc--version', (continued)
- scratch/package-vc-fixes 685b4b274b 08/48: Fix the docstring for 'package-vc--version', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes c29189587b 07/48: Fix 'package-vc-selected-packages' documentation, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 6a46e7d3ee 17/48: Move package spec documentation to 'package-vc-selected-packages', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 58b2a64225 23/48: Fix edebug spec for 'package--with-response-buffer', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes b45d2fb4b2 29/48: * lisp/emacs-lisp/package-vc.el (package-vc-update-all): Add command, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes a10cd1b927 36/48: Fix accidental generation of circular lists, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes bc9c7aee30 34/48: Improve robustness of 'package-vc-update', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes a89f7bc1dc 27/48: Raise 'wrong-type-argument' when installing package nil, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4730409de9 38/48: Fix the behaviour or 'byte-compile-ignore-files', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 663cb70e15 40/48: Remove temporary .texi files if used to build documentation, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 6b35279259 45/48: Fix issues related to 'package-vc-install-from-checkout',
Philip Kaludercic <=
- scratch/package-vc-fixes c383864f96 46/48: Have 'package-delete' handle symlinked packages correctly, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 7815894592 11/48: Remove references to internal symbols from public docstrings, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 2121ef0899 12/48: Fix generation of documentation for source packages, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4b30679030 15/48: Explain what "refreshing" a source package means, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes aab49e7baa 35/48: * lisp/emacs-lisp/package.el (package-lisp-dir): Fix return value, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes aeb386007b 04/48: Mark 'package-vc-install-selected-packages' as interactive, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 32310b69ab 01/48: ; Fix interactive spec for 'package-vc-refresh', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes bea359d186 05/48: Autoload 'package-vc-install-selected-packages', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes d051b24c3c 09/48: Clarify 'package-vc--build-documentation' docstring, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 7e15f35bac 19/48: Avoid using 'package-lisp-dir' in 'package-generate-autoloads', Philip Kaludercic, 2022/11/16