From 5929ea7b4d58dca0c7be920b7e31a8ee4b467f61 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Tue, 19 May 2020 19:33:10 +0200 Subject: [PATCH] conda: take subprio into account for initial sort --- src/policy.c | 4 ++++ 1 file changed, 4 insertions(+) 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; } -- 2.47.2