Fix doom-initialize-packages
This commit is contained in:
parent
8282280965
commit
30893b0ff1
1 changed files with 21 additions and 21 deletions
|
@ -316,28 +316,28 @@ them."
|
||||||
;; there's no non-trivial way to detect that, so we give you a way to
|
;; there's no non-trivial way to detect that, so we give you a way to
|
||||||
;; reload only doom-packages (by passing 'internal as FORCE-P).
|
;; reload only doom-packages (by passing 'internal as FORCE-P).
|
||||||
;; `doom-packages'
|
;; `doom-packages'
|
||||||
|
(unless (eq force-p 'internal)
|
||||||
|
;; `package-alist'
|
||||||
|
(when (or force-p (not (bound-and-true-p package-alist)))
|
||||||
|
(setq load-path doom-site-load-path)
|
||||||
|
(require 'package)
|
||||||
|
(setq package-activated-list nil
|
||||||
|
package--initialized nil)
|
||||||
|
(let (byte-compile-warnings)
|
||||||
|
(condition-case _
|
||||||
|
(quiet! (package-initialize))
|
||||||
|
('error (package-refresh-contents)
|
||||||
|
(setq doom--refreshed-p t)
|
||||||
|
(package-initialize)))))
|
||||||
|
|
||||||
|
;; `quelpa-cache'
|
||||||
|
(when (or force-p (not (bound-and-true-p quelpa-cache)))
|
||||||
|
(require 'quelpa)
|
||||||
|
(setq quelpa-initialized-p nil)
|
||||||
|
(or (quelpa-setup-p)
|
||||||
|
(error "Could not initialize quelpa"))))
|
||||||
|
|
||||||
(when (or force-p (not doom-packages))
|
(when (or force-p (not doom-packages))
|
||||||
(unless (eq force-p 'internal)
|
|
||||||
;; `package-alist'
|
|
||||||
(when (or force-p (not (bound-and-true-p package-alist)))
|
|
||||||
(setq load-path doom-site-load-path)
|
|
||||||
(require 'package)
|
|
||||||
(setq package-activated-list nil
|
|
||||||
package--initialized nil)
|
|
||||||
(let (byte-compile-warnings)
|
|
||||||
(condition-case _
|
|
||||||
(package-initialize)
|
|
||||||
('error (package-refresh-contents)
|
|
||||||
(setq doom--refreshed-p t)
|
|
||||||
(package-initialize)))))
|
|
||||||
|
|
||||||
;; `quelpa-cache'
|
|
||||||
(when (or force-p (not (bound-and-true-p quelpa-cache)))
|
|
||||||
(require 'quelpa)
|
|
||||||
(setq quelpa-initialized-p nil)
|
|
||||||
(or (quelpa-setup-p)
|
|
||||||
(error "Could not initialize quelpa"))))
|
|
||||||
|
|
||||||
(setq doom-packages nil)
|
(setq doom-packages nil)
|
||||||
(cl-flet
|
(cl-flet
|
||||||
((_load
|
((_load
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue