mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 22:40:51 -08:00
Code Issues Projects Releases Wiki Activity

Merge pull request from emacsjanitors/demote-manually

Browse source 
Don't use with-demoted-errors in use-package-ensure-elpa
GitHub-reference: https://github.com/jwiegley/use-package/issues/507
This commit is contained in:
John Wiegley 2017-10-13 15:48:07 -07:00 • committed by GitHub
commit 426a319e1b
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/use-package/use-package.el
View file

@ -737,17 +737,21 @@ If the package is installed, its entry is removed from
;; bypassed.
(member context '(:byte-compile :ensure :config))
(y-or-n-p (format "Install package %S?" package))))
(with-demoted-errors (format "Cannot load %s: %%S" name)
(when (assoc package (bound-and-true-p package-pinned-packages))
(package-read-all-archive-contents))
(if (assoc package package-archive-contents)
(progn (package-install package) t)
(condition-case-unless-debug err
(progn
(package-refresh-contents)
(when (assoc package (bound-and-true-p
package-pinned-packages))
(when (assoc package (bound-and-true-p package-pinned-packages))
(package-read-all-archive-contents))
(package-install package))))))))
(cond ((assoc package package-archive-contents)
(package-install package)
t)
(t
(package-refresh-contents)
(when (assoc package
(bound-and-true-p package-pinned-packages))
(package-read-all-archive-contents))
(package-install package))))
(error (message "Error: Cannot load %s: %S" name err)
nil))))))
(defun use-package-handler/:ensure (name keyword ensure rest state)
(let* ((body (use-package-process-keywords name rest