From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 5 Apr 2013 18:46:59 +0000 (-0400)
Subject: * lisp/emacs-lisp/package.el (package-compute-transaction): Fix last fix.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~524
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=134abf1faef6596a62d3c04769e212b99f621d49;p=emacs.git

* 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 701973648c3..b3073dd9499 100644
--- 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 d005c200d0c..605d1cf375c 100644
--- 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