summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-04-03 22:46:38 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-04-03 22:46:38 -0400
commitb208ebc6e75d2dd78fa8b3d5dc6548215b0d3ef4 (patch)
treea2a681278bb1b319a13420989e1dd87025154726 /lisp/emacs-lisp
parentaab96513490ee93962c2268887ba3cd6393c32ac (diff)
downloademacs-b208ebc6e75d2dd78fa8b3d5dc6548215b0d3ef4.tar.gz
emacs-b208ebc6e75d2dd78fa8b3d5dc6548215b0d3ef4.tar.bz2
emacs-b208ebc6e75d2dd78fa8b3d5dc6548215b0d3ef4.zip
* lisp/emacs-lisp/package.el (package-compute-transaction): Fix ordering
when a package is required several times. Fixes: debbugs:14082
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f9a2881a45c..d005c200d0c 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -811,7 +811,10 @@ but version %s required"
(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)
- (push 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))))
(setq package-list
(package-compute-transaction package-list
(package-desc-reqs