emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: package recipes with relative :local-repo

Browse source 
Necessitated by 7e0c2ed, and missed in 45a66cd. This would indirectly
cause "No :repo specified for package 'X'" errors for packages with a
`:local-repo` relative to their packages.el file.

Amend: 45a66cda60
Ref: 7e0c2ed8a3
This commit is contained in:
Henrik Lissner 2022-09-10 20:41:21 +02:00
parent c80fa2efdf
commit 251ccbcc6b
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/doom-packages.el
View file

@ -554,10 +554,10 @@ elsewhere."
(cl-callf map-delete plist :built-in) (cl-callf map-delete plist :built-in)
(cl-callf plist-put plist :ignore built-in)) (cl-callf plist-put plist :ignore built-in))
`(let* ((name ',name) `(let* ((name ',name)
(plist (cdr (assq name doom-packages)))) (plist (cdr (assq name doom-packages)))
(dir (dir!)))
;; Record what module this declaration was found in ;; Record what module this declaration was found in
(let* ((dir (dir!)) (let ((module-list (plist-get plist :modules))
(module-list (plist-get plist :modules))
(module (doom-module-from-path dir))) (module (doom-module-from-path dir)))
(unless (member module module-list) (unless (member module module-list)
(cl-callf plist-put plist :modules (cl-callf plist-put plist :modules
@ -582,7 +582,7 @@ elsewhere."
(when local-repo (when local-repo
(cl-callf plist-put plist :recipe (cl-callf plist-put plist :recipe
(plist-put recipe :local-repo (plist-put recipe :local-repo
(let ((local-path (expand-file-name local-repo ,(dir!)))) (let ((local-path (expand-file-name local-repo dir)))
(if (file-directory-p local-path) (if (file-directory-p local-path)
local-path local-path
local-repo))))))) local-repo)))))))