From e42ab383731aec7822e7be4b0c0b9e163ccf0c5d Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Sun, 3 Sep 2023 13:05:43 +0200 Subject: [PATCH] Fix issue with #395 --- CHANGES.md | 2 +- lib/opam_solve.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 70543003f..7242545d9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -39,7 +39,7 @@ (#376 @Leonidas-from-XIV, @gridbugs) - Improve the ordering of package candidates by putting broken packages at - then end of the list (#395, @samoht) + then end of the list (#395, #397, @samoht) ### Removed diff --git a/lib/opam_solve.ml b/lib/opam_solve.ml index 93d6e5350..e04dc2188 100644 --- a/lib/opam_solve.ml +++ b/lib/opam_solve.ml @@ -175,7 +175,7 @@ module Opam_monorepo_context (Base_context : BASE_CONTEXT) : match opam_res with | Ok opam -> if Opam.avoid_version opam then (regular, e :: avoid, broken) - else (regular, avoid, e :: broken) + else (e :: regular, avoid, broken) | Error _ -> (regular, avoid, e :: broken)) in List.rev_append regular (List.rev_append avoid broken)