diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2018-01-02 15:35:24 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-01-09 09:54:53 +0200 |
| commit | 4d22966dacff6bad9f27a950fb6b5a2d2b1c4b21 (patch) | |
| tree | d48bd6a5f30189fd72b72aa7ec1c34b9c7f9a6b2 /src | |
| parent | 685795f24c7d37298c363bb70dc98e3a95ef4c81 (diff) | |
| download | apk-tools-4d22966dacff6bad9f27a950fb6b5a2d2b1c4b21.tar.gz apk-tools-4d22966dacff6bad9f27a950fb6b5a2d2b1c4b21.tar.bz2 apk-tools-4d22966dacff6bad9f27a950fb6b5a2d2b1c4b21.tar.xz apk-tools-4d22966dacff6bad9f27a950fb6b5a2d2b1c4b21.zip | |
commit: properly analyze packages with provides="$pkgname"
(cherry picked from commit 667cb6bca799e58f58f22ad868761c022c6600dc)
Diffstat (limited to 'src')
| -rw-r--r-- | src/commit.c | 3 |
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; } |