Commit 4d22966d authored by Timo Teräs's avatar Timo Teräs

commit: properly analyze packages with provides="$pkgname"

(cherry picked from commit 667cb6bc)
parent 685795f2
......@@ -456,7 +456,8 @@ static void print_conflicts(struct print_state *ps, struct apk_package *pkg)
if (d->version == &apk_null_blob &&
p->version == &apk_null_blob)
continue;
if (once && p->pkg == pkg) {
if (once && p->pkg == pkg &&
p->version == d->version) {
once = 0;
continue;
}
......
......@@ -67,3 +67,38 @@ S:1
I:1
p:selfprovided=2
p:selfprovided=3
C:Q1EyN5AdpAOBJWKMR89ppC66aaaaj=
P:conflicted-provider-a
V:0.1
S:1
I:1
p:conflicted-provider
C:Q1EyN5AdpAOBJWKMR89ppC66bbbbj=
P:conflicted-provider-b
V:0.1
S:1
I:1
p:conflicted-provider
C:Q1EyN5AdpAOBJWKMR89ppC66ccccj=
P:conflicted-dep
V:0.1
S:1
I:1
D:conflicted-provider
C:Q1EyN5AdpAOBJWKMR89ppC66ddddj=
P:conflicted-parent
V:0.1
S:1
I:1
D:conflicted-dep
C:Q1Eyd5AdpAOBJWKMR89ppC66bbbbj=
P:self-provide
V:0.1
S:1
I:1
p:self-provide
@ARGS
--test-repo provides.repo
add self-provide
@EXPECT
ERROR: unsatisfiable constraints:
self-provide-0.1:
conflicts: self-provide-0.1[self-provide]
satisfies: world[self-provide]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment