From 3b013f458225c2ad8a0d96ec3eb3dde2533e0312 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Thu, 24 Feb 2022 14:15:28 +0200 Subject: solver: do not auto select virtual-only package with one provider This reverts most of 0dcbd933 which allowed automatic selection of package with a "virtual provides" having only one provider. While convenient, it creates problems if multiple versions of the same package exist, or if in future other providers would be added to one of the repositories. This restore the original behaviour, and improve the error message to tell the user to mention one of the providers explicitly. fixes #10810 --- src/commit.c | 4 ++++ src/solver.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/commit.c b/src/commit.c index e9b6dbe..833ecfe 100644 --- a/src/commit.c +++ b/src/commit.c @@ -533,6 +533,10 @@ static void analyze_name(struct print_state *ps, struct apk_name *name) snprintf(tmp, sizeof(tmp), "%s (virtual)", name->name); ps->label = tmp; + label_start(ps, "note:"); + apk_print_indented_words(&ps->i, "please select one of the 'provided by' packages explicitly"); + label_end(ps); + label_start(ps, "provided by:"); foreach_array_item(p0, name->providers) p0->pkg->name->state_int++; diff --git a/src/solver.c b/src/solver.c index 810c9ce..06dfb6b 100644 --- a/src/solver.c +++ b/src/solver.c @@ -714,8 +714,8 @@ static void select_package(struct apk_solver_state *ss, struct apk_name *name) if (p->version == &apk_atom_null && p->pkg->name->auto_select_virtual == 0 && p->pkg->name->ss.requirers == 0 && - (p->pkg->provider_priority == 0 && name->providers->num > 1)) { - dbg_printf(" ignore: virtual package without provider_priority with >1 provider\n"); + p->pkg->provider_priority == 0) { + dbg_printf(" ignore: virtual package without provider_priority\n"); continue; } if (compare_providers(ss, p, &chosen) > 0) { -- cgit v1.2.3-60-g2f50