From 03844f5dbe8535aa532ff2c1c4bdbc18ed6b8453 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Wed, 19 May 2021 16:29:55 +0300 Subject: solver: don't consider requirer count for preference The original intent was to choose packages to which there is most dependencies. However, since the code has evolved this is has been mostly obsolete. And in fact now interferes with the provides and provides priority mechanism. Remove this as obsolete. Fixes #10742 --- src/solver.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src') diff --git a/src/solver.c b/src/solver.c index 25ea471..84fc6c9 100644 --- a/src/solver.c +++ b/src/solver.c @@ -493,17 +493,6 @@ static void reconsider_name(struct apk_solver_state *ss, struct apk_name *name) name->name, name->ss.has_options, name->ss.reverse_deps_done); } -static int count_requirers(const struct apk_package *pkg) -{ - int cnt = pkg->name->ss.requirers; - struct apk_dependency *p; - - foreach_array_item(p, pkg->provides) - cnt += p->name->ss.requirers; - - return cnt; -} - static int compare_providers(struct apk_solver_state *ss, struct apk_provider *pA, struct apk_provider *pB) { @@ -575,11 +564,6 @@ static int compare_providers(struct apk_solver_state *ss, if (r) return r; - /* Prefer highest requirer count. */ - r = count_requirers(pkgA) - count_requirers(pkgB); - if (r) - return r; - /* Prefer installed */ if (!(solver_flags & APK_SOLVERF_UPGRADE) || (solver_flags & APK_SOLVERF_IGNORE_UPGRADE)) { -- cgit v1.2.3-70-g09d2