diff options
| author | Artur Malabarba | 2015-02-01 20:50:13 -0200 |
|---|---|---|
| committer | Artur Malabarba | 2015-02-01 20:50:13 -0200 |
| commit | 8334021e5a9918ba8beb56fd35643c6e248e9eec (patch) | |
| tree | dac7252f244d6007bd7b11d8629358963d77928f | |
| parent | 5329208bafa0b51b4fe07c185972b1d98af98c1d (diff) | |
| download | emacs-8334021e5a9918ba8beb56fd35643c6e248e9eec.tar.gz emacs-8334021e5a9918ba8beb56fd35643c6e248e9eec.zip | |
package.el (package--get-deps): Fix for indirect dependencies.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 149c807f230..5498967dba4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * emacs-lisp/package.el (package-selected-packages): Fix :type | 3 | * emacs-lisp/package.el (package-selected-packages): Fix :type |
| 4 | (package-install): Rename ARG to MARK-SELECTED. | 4 | (package-install): Rename ARG to MARK-SELECTED. |
| 5 | (package--get-deps): Fix for indirect dependencies. | ||
| 5 | 6 | ||
| 6 | 2015-02-01 Thierry Volpiatto <thierry.volpiatto@gmail.com> | 7 | 2015-02-01 Thierry Volpiatto <thierry.volpiatto@gmail.com> |
| 7 | 8 | ||
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c322ce8cc56..eae75621f4c 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1428,12 +1428,9 @@ The file can either be a tar file or an Emacs Lisp file." | |||
| 1428 | when (assq name package-alist) | 1428 | when (assq name package-alist) |
| 1429 | collect name)) | 1429 | collect name)) |
| 1430 | (indirect-deps (unless (eq only 'direct) | 1430 | (indirect-deps (unless (eq only 'direct) |
| 1431 | (cl-loop for p in direct-deps | 1431 | (apply #'append |
| 1432 | for dep = (cadr (assq p package-alist)) | 1432 | direct-deps |
| 1433 | when (and dep (assq p package-alist)) | 1433 | (mapcar #'package--get-deps direct-deps))))) |
| 1434 | append (mapcar 'car | ||
| 1435 | (package-desc-reqs | ||
| 1436 | dep)))))) | ||
| 1437 | (cl-case only | 1434 | (cl-case only |
| 1438 | (direct direct-deps) | 1435 | (direct direct-deps) |
| 1439 | (separate (list direct-deps indirect-deps)) | 1436 | (separate (list direct-deps indirect-deps)) |