core/autoload/packages: refactor

This commit is contained in:
Henrik Lissner 2017-05-16 00:49:25 +02:00
parent 1ff56b33e1
commit ac3e63715d

View file

@ -170,18 +170,14 @@ appropriate."
(unless (package-installed-p name) (unless (package-installed-p name)
(user-error "%s isn't installed" name)) (user-error "%s isn't installed" name))
(when (doom-package-outdated-p name) (when (doom-package-outdated-p name)
(let ((inhibit-message (not doom-debug-mode)) (let ((inhibit-message (not doom-debug-mode)))
quelpa-modified-p)
(pcase (doom-package-backend name) (pcase (doom-package-backend name)
('quelpa ('quelpa
(let ((quelpa-upgrade-p t)) (let ((quelpa-upgrade-p t))
(quelpa (assq name quelpa-cache)) (quelpa (assq name quelpa-cache))))
(setq quelpa-modified-p t)))
('elpa ('elpa
(doom-delete-package name t) (doom-delete-package name t)
(doom-install-package name))) (doom-install-package name))))
(when quelpa-modified-p
(quelpa-save-cache)))
(version-list-= (version-list-=
(package-desc-version (cadr (assq name package-alist))) (package-desc-version (cadr (assq name package-alist)))
(package-desc-version (cadr (assq name package-archive-contents)))))) (package-desc-version (cadr (assq name package-archive-contents))))))
@ -191,9 +187,8 @@ appropriate."
(doom-initialize) (doom-initialize)
(unless (package-installed-p name) (unless (package-installed-p name)
(user-error "%s isn't installed" name)) (user-error "%s isn't installed" name))
(let ((desc (cadr (assq name package-alist))) (let ((inhibit-message (not doom-debug-mode)))
(inhibit-message t)) (package-delete (cadr (assq name package-alist)) force-p))
(package-delete desc force-p))
(not (package-installed-p name))) (not (package-installed-p name)))