From: Jonas Haag <jonas@lophus.org>
Date: Sat, 2 Dec 2023 11:21:51 +0000 (+0100)
Subject: Disable choice rules for Conda
X-Git-Tag: 0.7.28~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F546%2Fhead;p=thirdparty%2Flibsolv.git

Disable choice rules for Conda
---

diff --git a/src/solver.c b/src/solver.c
index bdce9a9d..363d8873 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -4297,7 +4297,7 @@ solver_solve(Solver *solv, Queue *job)
   else
     solv->strictrepopriorules = solv->strictrepopriorules_end = solv->nrules;
 
-  if (1)
+  if (pool->disttype != DISTTYPE_CONDA)
     solver_addchoicerules(solv);
   else
     solv->choicerules = solv->choicerules_end = solv->nrules;