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

Suggested by Donald Curtis <dcurtis@coe.edu>.

Fixes: debbugs:14082

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 701973648c38271c6b6456e274b17ca61c30a209..b3073dd9499676c55b5a898f0b18f221276f7a72 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/package.el (package-compute-transaction): Fix last fix.
+       Suggested by Donald Curtis <dcurtis@coe.edu> (bug#14082).
+
 2013-04-05  Jacek Chrząszcz  <chrzaszcz@mimuw.edu.pl> (tiny change)
 
        * ispell.el (ispell-set-spellchecker-params):

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d005c200d0c68f3983ce85f5f28723cd1570d826..605d1cf375c94d92c61ca9bae845e5dbee014c61 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -809,12 +809,8 @@ but version %s required"
             "Need package `%s-%s', but only %s is available"
             (symbol-name next-pkg) (package-version-join next-version)
             (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)
-            (setq package-list
-                  ;; Move to front, so it gets installed early enough
-                  ;; (bug#14082).
-                  (cons next-pkg (delq next-pkg package-list))))
+          ;; Move to front, so it gets installed early enough (bug#14082).
+          (setq package-list (cons next-pkg (delq next-pkg package-list)))
          (setq package-list
                (package-compute-transaction package-list
                                             (package-desc-reqs