package.el (package--get-deps): Fix for indirect dependencies.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 149c807f2305080258227b8c24ac33a21babe9e2..5498967dba49a38c03e627a053841196f5e4a239 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * emacs-lisp/package.el (package-selected-packages): Fix :type
        (package-install): Rename ARG to MARK-SELECTED.
+       (package--get-deps): Fix for indirect dependencies.
 
 2015-02-01  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index c322ce8cc56b4dd289ac4e71c5938c0baacb0c2a..eae75621f4c104e4e7396e9be7301c53df6fe6d9 100644 (file)
--- 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."
                                when (assq name package-alist)
                                collect name))
          (indirect-deps (unless (eq only 'direct)
-                          (cl-loop for p in direct-deps
-                                   for dep = (cadr (assq p package-alist))
-                                   when (and dep (assq p package-alist))
-                                   append (mapcar 'car
-                                                  (package-desc-reqs
-                                                   dep))))))
+                          (apply #'append
+                            direct-deps
+                            (mapcar #'package--get-deps direct-deps)))))
     (cl-case only
       (direct   direct-deps)
       (separate (list direct-deps indirect-deps))