Fix package install not retrying after a 'bad request' error

This commit is contained in:
Henrik Lissner 2018-05-25 02:16:19 +02:00
parent 6e82e6fa19
commit d9894f0b74
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -423,20 +423,17 @@ calls."
(print! "Installing %s" (car pkg)) (print! "Installing %s" (car pkg))
(doom--condition-case! (doom--condition-case!
(print! "%s%s" (print! "%s%s"
(if (and (package-installed-p (car pkg)) (cond ((and (package-installed-p (car pkg))
(not (doom-package-different-backend-p (car pkg))) (not (doom-package-different-backend-p (car pkg)))
(not (doom-package-different-recipe-p (car pkg)))) (not (doom-package-different-recipe-p (car pkg))))
(dark (white "⚠ ALREADY INSTALLED")) (dark (white "⚠ ALREADY INSTALLED")))
(condition-case e ((doom-install-package (car pkg) (cdr pkg))
(if (doom-install-package (car pkg) (cdr pkg)) (setq success t)
(prog1 (green "✓ DONE") (green "✓ DONE"))
(setq success t)) ((red "✕ FAILED")))
(red "✕ FAILED")) (if (plist-member (cdr pkg) :pin)
(error (format " [pinned: %s]" (plist-get (cdr pkg) :pin))
(red "✕ ERROR (%s)" e)))) ""))))
(if (plist-member (cdr pkg) :pin)
(format " [pinned: %s]" (plist-get (cdr pkg) :pin))
""))))
(print! (bold (green "Finished!"))) (print! (bold (green "Finished!")))
(if success (doom-delete-autoloads-file doom-package-autoload-file)) (if success (doom-delete-autoloads-file doom-package-autoload-file))
success))))) success)))))