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

cute-signatures
Timo Teräs 2018-01-02 15:35:24 +02:00
parent 2a161588fb
commit 667cb6bca7
3 changed files with 17 additions and 1 deletions

View File

@ -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;
}

View File

@ -97,3 +97,10 @@ 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

8
test/provides12.test Normal file
View File

@ -0,0 +1,8 @@
@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]