emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix wrong-type-argument on quelpa package update

Browse source
This commit is contained in:
Henrik Lissner 2017-06-03 21:30:41 +02:00
parent 09ec857c60
commit ca96b0d9c5
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/autoload/packages.el
View file

@ -218,7 +218,8 @@ 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))
(desc (cadr (assq name package-alist))))
(pcase (doom-package-backend name) (pcase (doom-package-backend name)
('quelpa ('quelpa
(or (quelpa-setup-p) (or (quelpa-setup-p)
@ -226,8 +227,7 @@ appropriate."
(let ((quelpa-upgrade-p t)) (let ((quelpa-upgrade-p t))
(quelpa (assq name quelpa-cache)))) (quelpa (assq name quelpa-cache))))
('elpa ('elpa
(let* ((desc (cadr (assq name package-alist))) (let* ((archive (cadr (assq name package-archive-contents)))
(archive (cadr (assq name package-archive-contents)))
(packages (packages
(if (package-desc-p archive) (if (package-desc-p archive)
(package-compute-transaction (list archive) (package-desc-reqs archive)) (package-compute-transaction (list archive) (package-desc-reqs archive))
@ -235,10 +235,10 @@ appropriate."
(package-download-transaction packages) (package-download-transaction packages)
(when-let (old-dir (package-desc-dir desc)) (when-let (old-dir (package-desc-dir desc))
(when (file-directory-p old-dir) (when (file-directory-p old-dir)
(delete-directory old-dir t))))))) (delete-directory old-dir t))))))
(version-list-= (version-list-<
(package-desc-version (cadr (assq name package-alist))) (package-desc-version desc)
(package-desc-version (cadr (assq name package-archive-contents)))))) (package-desc-version (cadr (assq name package-alist)))))))
(defun doom-delete-package (name &optional force-p) (defun doom-delete-package (name &optional force-p)
"Uninstalls package NAME if it exists, and clears it from `quelpa-cache'." "Uninstalls package NAME if it exists, and clears it from `quelpa-cache'."