diff options
| author | Artur Malabarba | 2015-02-02 13:26:40 -0200 |
|---|---|---|
| committer | Artur Malabarba | 2015-02-02 13:26:40 -0200 |
| commit | 8ad2ee33a1107afe2d35e3ba4506d45dbb4c13d2 (patch) | |
| tree | 2743fc0c86e913a3a8a84888e5c25b672aae955a | |
| parent | ef6fa2fe0dbc09a637239b039bce5668c5215321 (diff) | |
| download | emacs-8ad2ee33a1107afe2d35e3ba4506d45dbb4c13d2.tar.gz emacs-8ad2ee33a1107afe2d35e3ba4506d45dbb4c13d2.zip | |
emacs-lisp/package.el (package--get-deps): Fix returning duplicates.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1c0518b6e21..382b6537af6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | function. | 4 | function. |
| 5 | (package-initialize): Use it to populate `package-selected-packages'. | 5 | (package-initialize): Use it to populate `package-selected-packages'. |
| 6 | (package-menu-execute): Clean unnecessary `and'. | 6 | (package-menu-execute): Clean unnecessary `and'. |
| 7 | (package--get-deps): Fix returning duplicates. | ||
| 7 | 8 | ||
| 8 | 2015-02-02 Michael Albinus <michael.albinus@gmx.de> | 9 | 2015-02-02 Michael Albinus <michael.albinus@gmx.de> |
| 9 | 10 | ||
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c4a658b3d2e..16271060626 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1428,9 +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 | (apply #'append | 1431 | (delete-dups |
| 1432 | direct-deps | 1432 | (cl-loop for p in direct-deps |
| 1433 | (mapcar #'package--get-deps direct-deps))))) | 1433 | append (package--get-deps p)))))) |
| 1434 | (cl-case only | 1434 | (cl-case only |
| 1435 | (direct direct-deps) | 1435 | (direct direct-deps) |
| 1436 | (separate (list direct-deps indirect-deps)) | 1436 | (separate (list direct-deps indirect-deps)) |