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

when a package is required several times.

Fixes: debbugs:14082

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e50cce354d563390145982446dbbf2f9747fac5..1f033f175c5e0e794faffe4958f1aa6fde3c762b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f9a2881a45cb10c188e3a0380245f806149c54ef..d005c200d0c68f3983ce85f5f28723cd1570d826 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -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