]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix order in which package-vc dependencies are resolved
authorPhilip Kaludercic <philipk@posteo.net>
Sat, 19 Aug 2023 09:27:02 +0000 (11:27 +0200)
committerPhilip Kaludercic <philipk@posteo.net>
Sat, 19 Aug 2023 09:39:50 +0000 (11:39 +0200)
* 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

index ffc7afeb2eeada335e263f41edf08320c4c4d846..c7a30736e32eaae5ace6a370e566d35ad63c934c 100644 (file)
@@ -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)