From 17477101dd138aa2b7d01f796b48d6452ab9a27c Mon Sep 17 00:00:00 2001 From: Herman Rimm Date: Sat, 11 Jan 2025 15:37:06 +0100 Subject: [PATCH] import: crate: Fix find-package-version. Fixes bug from 5ce1512b0f68cf39cb399623a14302f309c06129, where the earliest existing package (if any) was returned instead. See also: https://issues.guix.gnu.org/68346#3-lineno97 * guix/import/crate.scm (crate->guix-package)[find-package-version]: Invert boolean expression. Change-Id: I1d05f55a027241e7c5f62cc98a50a09b5639bdcf Signed-off-by: Efraim Flashner --- guix/import/crate.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index b4806c8bb22e5996779ef5a224c2d84e9513b94a..a7134b857225f9610ea6166f29fad78e064c2770 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -335,9 +335,9 @@ look up the development dependencs for the given crate." (find-packages-by-name (crate-name->package-name name)))) (match-lambda* (((semver1 yanked1) (semver2 yanked2)) - (or (and yanked1 (not yanked2)) - (and (eq? yanked1 yanked2) - (semver? semver1 semver2)))))))) (and (not (eq? #f version)) (match-let (((semver yanked) version)) (list (semver->string semver) yanked)))))