From 30893b0ff1d8ec80fae7a96152ff998b1610c6bd Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 24 May 2018 21:17:35 +0200 Subject: [PATCH] Fix doom-initialize-packages --- core/core-packages.el | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 19c1746de..f91ee5e1d 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -316,28 +316,28 @@ them." ;; 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). ;; `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)) - (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) (cl-flet ((_load