dev: merge from master

This commit is contained in:
Matt Nish-Lapidus 2024-08-07 08:58:01 -04:00
commit 58ad076f8f

View file

@ -73,7 +73,7 @@ OPTIONS:
(when (and old-host (not (equal old-host (system-name)))) (when (and old-host (not (equal old-host (system-name))))
(print! (warn "Your system has changed since last sync")) (print! (warn "Your system has changed since last sync"))
(setq to-rebuild t)) (setq to-rebuild t))
(when (and to-rebuild (not (doom-cli-context-suppress-prompts-p context))) (when (and to-rebuild (not rebuild?) (not (doom-cli-context-suppress-prompts-p context)))
(cond (nobuild? (cond (nobuild?
(print! (warn "Packages must be rebuilt, but -B has prevented it. Skipping..."))) (print! (warn "Packages must be rebuilt, but -B has prevented it. Skipping...")))
((doom-cli-context-get context 'upgrading) ((doom-cli-context-get context 'upgrading)