From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 19 Aug 2023 09:27:02 +0000 (+0200)
Subject: Fix order in which package-vc dependencies are resolved
X-Git-Tag: emacs-29.1.90~189
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c125bd060e28367239779e25c1586a52fbfa54db;p=emacs.git

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)
---

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)