diff options
| author | Philip Kaludercic | 2023-08-19 11:27:02 +0200 |
|---|---|---|
| committer | Philip Kaludercic | 2023-08-19 11:39:50 +0200 |
| commit | c125bd060e28367239779e25c1586a52fbfa54db (patch) | |
| tree | 6dd0254403da2555f65ebe2747c64eda2d3e9028 | |
| parent | 500ced133ad85437fefb98cd89a162a6ff6b7e09 (diff) | |
| download | emacs-c125bd060e28367239779e25c1586a52fbfa54db.tar.gz emacs-c125bd060e28367239779e25c1586a52fbfa54db.zip | |
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)
| -rw-r--r-- | lisp/emacs-lisp/package-vc.el | 6 |
1 files 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." | |||
| 413 | (desc (cadr (assoc package pac)))) | 413 | (desc (cadr (assoc package pac)))) |
| 414 | (and desc (seq-some | 414 | (and desc (seq-some |
| 415 | (apply-partially #'depends-on-p target) | 415 | (apply-partially #'depends-on-p target) |
| 416 | (package-desc-reqs desc)))))) | 416 | (mapcar #'car (package-desc-reqs desc))))))) |
| 417 | (dependent-order (a b) | 417 | (dependent-order (a b) |
| 418 | (let ((desc-a (package-desc-name a)) | 418 | (let ((desc-a (package-desc-name a)) |
| 419 | (desc-b (package-desc-name b))) | 419 | (desc-b (package-desc-name b))) |
| 420 | (or (not desc-a) (not desc-b) | 420 | (depends-on-p desc-a desc-b)))) |
| 421 | (not (depends-on-p desc-b desc-a)) | ||
| 422 | (depends-on-p desc-a desc-b))))) | ||
| 423 | (mapc #'search requirements) | 421 | (mapc #'search requirements) |
| 424 | (cl-callf sort to-install #'version-order) | 422 | (cl-callf sort to-install #'version-order) |
| 425 | (cl-callf seq-uniq to-install #'duplicate-p) | 423 | (cl-callf seq-uniq to-install #'duplicate-p) |