* lisp/emacs-lisp/package.el (package-compute-transaction): Fix ordering

when a package is required several times.

Fixes: debbugs:14082
This commit is contained in:
Stefan Monnier 2013-04-03 22:46:38 -04:00
parent aab9651349
commit b208ebc6e7
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2013-04-04 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/package.el (package-compute-transaction): Fix ordering
when a package is required several times (bug#14082).
2013-04-04 Roland Winkler <winkler@gnu.org>
* faces.el (read-face-name): Behave as promised by the docstring.

View file

@ -811,7 +811,10 @@ but version %s required"
(package-version-join (package-desc-vers (cdr pkg-desc)))))
;; Only add to the transaction if we don't already have it.
(unless (memq next-pkg package-list)
(push next-pkg package-list))
(setq package-list
;; Move to front, so it gets installed early enough
;; (bug#14082).
(cons next-pkg (delq next-pkg package-list))))
(setq package-list
(package-compute-transaction package-list
(package-desc-reqs