From d9894f0b747e09270c3588d2810ff582ae4ce239 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 25 May 2018 02:16:19 +0200 Subject: [PATCH] Fix package install not retrying after a 'bad request' error --- core/autoload/packages.el | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/core/autoload/packages.el b/core/autoload/packages.el index a94da7b7f..09cc577fb 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -423,20 +423,17 @@ calls." (print! "Installing %s" (car pkg)) (doom--condition-case! (print! "%s%s" - (if (and (package-installed-p (car pkg)) - (not (doom-package-different-backend-p (car pkg))) - (not (doom-package-different-recipe-p (car pkg)))) - (dark (white "⚠ ALREADY INSTALLED")) - (condition-case e - (if (doom-install-package (car pkg) (cdr pkg)) - (prog1 (green "✓ DONE") - (setq success t)) - (red "✕ FAILED")) - (error - (red "✕ ERROR (%s)" e)))) - (if (plist-member (cdr pkg) :pin) - (format " [pinned: %s]" (plist-get (cdr pkg) :pin)) - "")))) + (cond ((and (package-installed-p (car pkg)) + (not (doom-package-different-backend-p (car pkg))) + (not (doom-package-different-recipe-p (car pkg)))) + (dark (white "⚠ ALREADY INSTALLED"))) + ((doom-install-package (car pkg) (cdr pkg)) + (setq success t) + (green "✓ DONE")) + ((red "✕ FAILED"))) + (if (plist-member (cdr pkg) :pin) + (format " [pinned: %s]" (plist-get (cdr pkg) :pin)) + "")))) (print! (bold (green "Finished!"))) (if success (doom-delete-autoloads-file doom-package-autoload-file)) success)))))