summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2022-12-22 14:40:01 +0200
committerTimo Teräs <timo.teras@iki.fi>2022-12-22 14:40:01 +0200
commit92970a8fea45345fcfca3ba03f3ebbfdf48d6597 (patch)
tree8f514cb161026b5d0708b0c6d5bb60d694f93f36
parente60a6eb372ced4ad4953fce22ac932e57731c119 (diff)
downloadapk-tools-92970a8fea45345fcfca3ba03f3ebbfdf48d6597.tar.gz
apk-tools-92970a8fea45345fcfca3ba03f3ebbfdf48d6597.tar.bz2
apk-tools-92970a8fea45345fcfca3ba03f3ebbfdf48d6597.tar.xz
apk-tools-92970a8fea45345fcfca3ba03f3ebbfdf48d6597.zip
commit: consider also provides_priority for error analysis
-rw-r--r--src/commit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/commit.c b/src/commit.c
index 7ca39d3..5a411e1 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -659,7 +659,8 @@ static void discover_name(struct apk_name *name, int pkg_state)
foreach_array_item(p, name->providers) {
int state = pkg_state;
if (!p->pkg->marked) continue;
- if (state == STATE_PRESENT && !is_name_concrete(p->pkg, name))
+ if (state == STATE_PRESENT && !p->pkg->provider_priority &&
+ !is_name_concrete(p->pkg, name))
state = STATE_VIRTUAL_ONLY;
if (p->pkg->state_int & state) continue;
p->pkg->state_int |= state;