From 667cb6bca799e58f58f22ad868761c022c6600dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Tue, 2 Jan 2018 15:35:24 +0200
Subject: [PATCH] commit: properly analyze packages with provides="$pkgname"

---
 src/commit.c         | 3 ++-
 test/provides.repo   | 7 +++++++
 test/provides12.test | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 test/provides12.test

diff --git a/src/commit.c b/src/commit.c
index 9efae1f..0c0bb34 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -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;
 			}
diff --git a/test/provides.repo b/test/provides.repo
index 8776803..58bd416 100644
--- a/test/provides.repo
+++ b/test/provides.repo
@@ -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
diff --git a/test/provides12.test b/test/provides12.test
new file mode 100644
index 0000000..1bee4f9
--- /dev/null
+++ b/test/provides12.test
@@ -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]