From c125bd060e28367239779e25c1586a52fbfa54db Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sat, 19 Aug 2023 11:27:02 +0200 Subject: [PATCH] Fix order in which package-vc dependencies are resolved * lisp/emacs-lisp/package-vc.el (package-vc-install-dependencies): Avoid a type-mismatch when comparing two packages. (Bug#65283) --- lisp/emacs-lisp/package-vc.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index ffc7afeb2ee..c7a30736e32 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -413,13 +413,11 @@ version of that package." (desc (cadr (assoc package pac)))) (and desc (seq-some (apply-partially #'depends-on-p target) - (package-desc-reqs desc)))))) + (mapcar #'car (package-desc-reqs desc))))))) (dependent-order (a b) (let ((desc-a (package-desc-name a)) (desc-b (package-desc-name b))) - (or (not desc-a) (not desc-b) - (not (depends-on-p desc-b desc-a)) - (depends-on-p desc-a desc-b))))) + (depends-on-p desc-a desc-b)))) (mapc #'search requirements) (cl-callf sort to-install #'version-order) (cl-callf seq-uniq to-install #'duplicate-p) -- 2.39.2