From 8d112fdca8fe1eb43be01afab0d6ba3f04dacc96 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 10 Nov 2019 20:15:25 -0500 Subject: [PATCH] Prevent void-variable errors on 'doom upgrade' If Doom is up-to-date, certain Doom package state doesn't get initialized for the 'doom update' that occurs directly after, causing these errors. --- core/cli/upgrade.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/cli/upgrade.el b/core/cli/upgrade.el index 7116d7395..334fae5d3 100644 --- a/core/cli/upgrade.el +++ b/core/cli/upgrade.el @@ -13,9 +13,11 @@ following shell commands: bin/doom refresh bin/doom update" :bare t - (and (doom-cli-upgrade doom-auto-accept force-p) - (doom-cli-packages-update) - (doom-cli-reload-package-autoloads 'force-p))) + (when (doom-cli-upgrade doom-auto-accept force-p) + (doom-initialize) + (doom-initialize-packages) + (when (doom-cli-packages-update) + (doom-cli-reload-package-autoloads 'force-p)))) ;;