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

[Stefan Monnier]

------------------------------------------------------------
revno: 112231
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14082
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-04-05 14:46:59 -0400
message:
  * lisp/emacs-lisp/package.el (package-compute-transaction): Fix last fix.
  Suggested by Donald Curtis <address@hidden>.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-05 15:43:07 +0000
+++ b/lisp/ChangeLog    2013-04-05 18:46:59 +0000
@@ -1,3 +1,8 @@
+2013-04-05  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/package.el (package-compute-transaction): Fix last fix.
+       Suggested by Donald Curtis <address@hidden> (bug#14082).
+
 2013-04-05  Jacek Chrząszcz  <address@hidden> (tiny change)
 
        * ispell.el (ispell-set-spellchecker-params):

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-04-04 02:46:38 +0000
+++ b/lisp/emacs-lisp/package.el        2013-04-05 18:46:59 +0000
@@ -809,12 +809,8 @@
             "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