From b12edc61711d383819f0119d9227ad856c4556aa Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 8 Oct 2019 09:36:01 -0400 Subject: [PATCH] * 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. --- lisp/emacs-lisp/package.el | 3 ++- test/lisp/emacs-lisp/package-tests.el | 25 ++++++++----------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 169bcda69f0..0b2dc24ebb9 100644 --- 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 f450fd27c28..0edb81d6a11 100644 --- 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." -- 2.39.5