Fix private & elpa package lists in doom/info

And display errors if something went wrong.
This commit is contained in:
Henrik Lissner 2019-12-14 18:23:30 -05:00
parent c088aaeb1b
commit e623fde85a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -78,24 +78,24 @@ ready to be pasted in a bug report on github."
(cdr key)))) (cdr key))))
'("n/a"))) '("n/a")))
(packages (packages
,@(or (ignore-errors ,@(or (condition-case e
(let ((doom-interactive-mode t) (cl-loop for (name . plist) in (doom-package-list)
doom-packages if (cl-find :private (plist-get plist :modules)
doom-disabled-packages) :key #'car)
(doom--read-module-packages-file
(doom-path doom-private-dir "packages.el")
nil t)
(cl-loop for (name . plist) in (nreverse doom-packages)
collect collect
(if-let (splist (doom-plist-delete (copy-sequence plist) (if-let (splist (doom-plist-delete (copy-sequence plist)
:modules)) :modules))
(prin1-to-string (cons name splist)) (prin1-to-string (cons name splist))
name)))) name))
(error (format "<%S>" e)))
'("n/a"))) '("n/a")))
(elpa (elpa
,@(or (ignore-errors ,@(or (condition-case e
(cl-loop for (name . _) in package-alist (progn
collect (format "%s" name))) (package-initialize)
(cl-loop for (name . _) in package-alist
collect (format "%s" name)))
(error (format "<%S>" e)))
'("n/a")))))))) '("n/a"))))))))