From 134abf1faef6596a62d3c04769e212b99f621d49 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 5 Apr 2013 14:46:59 -0400 Subject: [PATCH] * lisp/emacs-lisp/package.el (package-compute-transaction): Fix last fix. Suggested by Donald Curtis . Fixes: debbugs:14082 --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package.el | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) 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 + + * emacs-lisp/package.el (package-compute-transaction): Fix last fix. + Suggested by Donald Curtis (bug#14082). + 2013-04-05 Jacek Chrząszcz (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 -- 2.39.2