[Emacs-diffs] /srv/bzr/emacs/trunk r112220: * lisp/emacs-lisp/package.el (package-compute-transaction): Fix ordering

[Stefan Monnier]

------------------------------------------------------------
revno: 112220
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14082
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-04-03 22:46:38 -0400
message:
  * lisp/emacs-lisp/package.el (package-compute-transaction): Fix ordering
  when a package is required several times.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-04 02:12:25 +0000
+++ b/lisp/ChangeLog    2013-04-04 02:46:38 +0000
@@ -1,3 +1,8 @@
+2013-04-04  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/package.el (package-compute-transaction): Fix ordering
+       when a package is required several times (bug#14082).
+
 2013-04-04  Roland Winkler  <address@hidden>
 
        * faces.el (read-face-name): Behave as promised by the docstring.

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-04-04 01:51:33 +0000
+++ b/lisp/emacs-lisp/package.el        2013-04-04 02:46:38 +0000
@@ -811,7 +811,10 @@
             (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