From: Wolf Vollprecht <w.vollprecht@gmail.com>
Date: Tue, 19 May 2020 17:33:10 +0000 (+0200)
Subject: conda: take subprio into account for initial sort
X-Git-Tag: 0.7.14~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F384%2Fhead;p=thirdparty%2Flibsolv.git

conda: take subprio into account for initial sort
---

diff --git a/src/policy.c b/src/policy.c
index fe8d55e3..16b890e8 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -906,10 +906,14 @@ prune_to_best_version(Pool *pool, Queue *plist)
       if (r == 0 && has_package_link(pool, s))
         r = pool_link_evrcmp(pool, best, s);
 #endif
+#ifdef ENABLE_CONDA
+      if (r == 0 && pool->disttype == DISTTYPE_CONDA)
+	r = best->repo->subpriority - s->repo->subpriority;
       if (r == 0 && pool->disttype == DISTTYPE_CONDA)
 	r = pool_buildversioncmp(pool, best, s);
       if (r == 0 && pool->disttype == DISTTYPE_CONDA)
 	r = pool_buildflavorcmp(pool, best, s);
+#endif
       if (r < 0)
 	best = s;
     }