aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-04-05 14:46:59 -0400
committerStefan Monnier2013-04-05 14:46:59 -0400
commit134abf1faef6596a62d3c04769e212b99f621d49 (patch)
tree4a8db28296d332179e05295932d3127f1dc6dbfc
parent7e268e9006c32eb1b1330aada4220e1a33859ad8 (diff)
downloademacs-134abf1faef6596a62d3c04769e212b99f621d49.tar.gz
emacs-134abf1faef6596a62d3c04769e212b99f621d49.zip
* lisp/emacs-lisp/package.el (package-compute-transaction): Fix last fix.
Suggested by Donald Curtis <dcurtis@coe.edu>. Fixes: debbugs:14082
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/package.el8
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 @@
12013-04-05 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/package.el (package-compute-transaction): Fix last fix.
4 Suggested by Donald Curtis <dcurtis@coe.edu> (bug#14082).
5
12013-04-05 Jacek Chrząszcz <chrzaszcz@mimuw.edu.pl> (tiny change) 62013-04-05 Jacek Chrząszcz <chrzaszcz@mimuw.edu.pl> (tiny change)
2 7
3 * ispell.el (ispell-set-spellchecker-params): 8 * 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"
809 "Need package `%s-%s', but only %s is available" 809 "Need package `%s-%s', but only %s is available"
810 (symbol-name next-pkg) (package-version-join next-version) 810 (symbol-name next-pkg) (package-version-join next-version)
811 (package-version-join (package-desc-vers (cdr pkg-desc))))) 811 (package-version-join (package-desc-vers (cdr pkg-desc)))))
812 ;; Only add to the transaction if we don't already have it. 812 ;; Move to front, so it gets installed early enough (bug#14082).
813 (unless (memq next-pkg package-list) 813 (setq package-list (cons next-pkg (delq next-pkg package-list)))
814 (setq package-list
815 ;; Move to front, so it gets installed early enough
816 ;; (bug#14082).
817 (cons next-pkg (delq next-pkg package-list))))
818 (setq package-list 814 (setq package-list
819 (package-compute-transaction package-list 815 (package-compute-transaction package-list
820 (package-desc-reqs 816 (package-desc-reqs