* lisp/emacs-lisp/package.el (package--get-deps): Fix thinko

* test/lisp/emacs-lisp/package-tests.el (package-test-get-deps):
Adjust test to new calling convention.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 169bcda69f05fd837142a8ba649998946e28c9cf..0b2dc24ebb91a86d100778d7fe68db17ad8da118 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1853,7 +1853,8 @@ if it is still empty."
           (let ((pkg-desc (cadr (assq pkg package-alist))))
             (when pkg-desc
               (push pkg seen)
-              (setq pkgs (append (package-desc-reqs pkg-desc) pkgs)))))))
+              (setq pkgs (append (mapcar #'car (package-desc-reqs pkg-desc))
+                                 pkgs)))))))
     seen))
 
 (defun package--user-installed-p (package)

diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index f450fd27c28a9af62ab767f994128c850f7f9a48..0edb81d6a11a64213c78ff68544f00ca4acf4e44 100644 (file)
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -654,25 +654,16 @@ Must called from within a `tar-mode' buffer."
                  multi-file-desc
                  new-pkg-desc
                  simple-depend-desc-1
-                 simple-depend-desc-2))))
-    (should
-     (equal (package--get-deps 'simple-depend)
-            '(simple-single)))
-    (should
-     (equal (package--get-deps 'simple-depend 'indirect)
-            nil))
-    (should
-     (equal (package--get-deps 'simple-depend 'direct)
-            '(simple-single)))
-    (should
-     (equal (package--get-deps 'simple-depend-2)
-            '(simple-depend-1 multi-file simple-depend simple-single)))
+                 simple-depend-desc-2)))
+        (pkg-cmp #'string-lessp))
     (should
-     (equal (package--get-deps 'simple-depend-2 'indirect)
-            '(simple-depend multi-file simple-single)))
+     (equal (sort (package--get-deps '(simple-depend)) pkg-cmp)
+            (sort (list 'simple-depend 'simple-single) pkg-cmp)))
     (should
-     (equal (package--get-deps 'simple-depend-2 'direct)
-            '(simple-depend-1 multi-file)))))
+     (equal (sort (package--get-deps '(simple-depend-2)) pkg-cmp)
+            (sort (list 'simple-depend-2 'simple-depend-1 'multi-file
+                        'simple-depend 'simple-single)
+                  pkg-cmp)))))
 
 (ert-deftest package-test-sort-by-dependence ()
   "Test `package--sort-by-dependence' with complex structures."