summaryrefslogtreecommitdiff
path: root/src/commit.c
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-01-02 15:35:24 +0200
committerTimo Teräs <timo.teras@iki.fi>2018-01-02 15:45:21 +0200
commit667cb6bca799e58f58f22ad868761c022c6600dc (patch)
tree6fa17fcce621586b19cf2806b73c4f7372a25810 /src/commit.c
parent2a161588fbf133e5941e9f7203f1fe580946d570 (diff)
downloadapk-tools-667cb6bca799e58f58f22ad868761c022c6600dc.tar.gz
apk-tools-667cb6bca799e58f58f22ad868761c022c6600dc.tar.bz2
apk-tools-667cb6bca799e58f58f22ad868761c022c6600dc.tar.xz
apk-tools-667cb6bca799e58f58f22ad868761c022c6600dc.zip
commit: properly analyze packages with provides="$pkgname"
Diffstat (limited to 'src/commit.c')
-rw-r--r--src/commit.c3
1 files changed, 2 insertions, 1 deletions
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;
}