]> code.delx.au - gnu-emacs-elpa/commitdiff
Use package--get-deps to get packages dependencies.
authorThierry Volpiatto <thierry.volpiatto@gmail.com>
Sun, 12 Apr 2015 13:14:28 +0000 (15:14 +0200)
committerThierry Volpiatto <thierry.volpiatto@gmail.com>
Sun, 12 Apr 2015 13:14:28 +0000 (15:14 +0200)
* async-bytecomp.el (async-bytecomp-get-allowed-pkgs): Use package--get-deps.
Inline it if not available.

async-bytecomp.el

index 5cf3f33371c385704762790978dfdc6d1b4bf003..2105fee85fce0b3bc11ee8a6f73ccccd5acdca41 100644 (file)
@@ -102,16 +102,34 @@ All *.elc files are systematically deleted before proceeding."
     (message "Started compiling asynchronously directory %s" directory)))
 
 (defvar package-archive-contents)
+(defvar package-alist)
 (declare-function package-desc-reqs "package.el" (cl-x))
+(declare-function package--get-deps "package.el" (pkg &optional only))
+
+(unless (fboundp 'package--get-deps)
+  (defun package--get-deps (pkg &optional only)
+    (let* ((pkg-desc (cadr (assq pkg package-alist)))
+           (direct-deps (cl-loop for p in (package-desc-reqs pkg-desc)
+                                 for name = (car p)
+                                 when (assq name package-alist)
+                                 collect name))
+           (indirect-deps (unless (eq only 'direct)
+                            (delete-dups
+                             (cl-loop for p in direct-deps
+                                      append (package--get-deps p))))))
+      (cl-case only
+        (direct   direct-deps)
+        (separate (list direct-deps indirect-deps))
+        (indirect indirect-deps)
+        (t        (delete-dups (append direct-deps indirect-deps)))))))
 
 (defun async-bytecomp-get-allowed-pkgs ()
   (when async-bytecomp-allowed-packages
     (cl-loop for p in async-bytecomp-allowed-packages
-          for pkg-desc = (car (assoc-default p package-archive-contents))
-          append (mapcar 'car (package-desc-reqs pkg-desc)) into reqs
-          finally return
-          (cl-remove-duplicates
-           (append async-bytecomp-allowed-packages reqs)))))
+             append (package--get-deps p) into reqs
+             finally return
+             (delete-dups
+              (append async-bytecomp-allowed-packages reqs)))))
 
 (defadvice package--compile (around byte-compile-async activate)
   (let ((cur-package (package-desc-name pkg-desc)))