diff options
| author | Stefan Monnier | 2013-04-03 22:46:38 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-04-03 22:46:38 -0400 |
| commit | b208ebc6e75d2dd78fa8b3d5dc6548215b0d3ef4 (patch) | |
| tree | a2a681278bb1b319a13420989e1dd87025154726 | |
| parent | aab96513490ee93962c2268887ba3cd6393c32ac (diff) | |
| download | emacs-b208ebc6e75d2dd78fa8b3d5dc6548215b0d3ef4.tar.gz emacs-b208ebc6e75d2dd78fa8b3d5dc6548215b0d3ef4.zip | |
* lisp/emacs-lisp/package.el (package-compute-transaction): Fix ordering
when a package is required several times.
Fixes: debbugs:14082
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1e50cce354d..1f033f175c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-04-04 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (package-compute-transaction): Fix ordering | ||
| 4 | when a package is required several times (bug#14082). | ||
| 5 | |||
| 1 | 2013-04-04 Roland Winkler <winkler@gnu.org> | 6 | 2013-04-04 Roland Winkler <winkler@gnu.org> |
| 2 | 7 | ||
| 3 | * faces.el (read-face-name): Behave as promised by the docstring. | 8 | * faces.el (read-face-name): Behave as promised by the docstring. |
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" | |||
| 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 | ;; Only add to the transaction if we don't already have it. |
| 813 | (unless (memq next-pkg package-list) | 813 | (unless (memq next-pkg package-list) |
| 814 | (push 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)))) | ||
| 815 | (setq package-list | 818 | (setq package-list |
| 816 | (package-compute-transaction package-list | 819 | (package-compute-transaction package-list |
| 817 | (package-desc-reqs | 820 | (package-desc-reqs |