summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-11-12 13:11:55 +0200
committerTimo Teräs <timo.teras@iki.fi>2015-11-12 13:11:55 +0200
commit31ed887a649eb19e754728966871b886b423c733 (patch)
treedb8e7ce0d23c073a7ed9e6adbe0d1aab5991cdd7
parent5a59c73ffd47a14ec9a6742e2ccf2a4f4330774d (diff)
downloadapk-tools-31ed887a649eb19e754728966871b886b423c733.tar.gz
apk-tools-31ed887a649eb19e754728966871b886b423c733.tar.bz2
apk-tools-31ed887a649eb19e754728966871b886b423c733.tar.xz
apk-tools-31ed887a649eb19e754728966871b886b423c733.zip
info: fix --installed test of conflicts
-rw-r--r--src/info.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/info.c b/src/info.c
index b163aa5..886d4fa 100644
--- a/src/info.c
+++ b/src/info.c
@@ -76,12 +76,12 @@ static void info_exists(struct info_ctx *ctx, struct apk_database *db,
if (name == NULL)
continue;
- ok = 0;
+ ok = apk_dep_is_provided(&dep, NULL);
foreach_array_item(p, name->providers) {
- if (p->pkg->ipkg == NULL || !apk_dep_is_provided(&dep, p))
- continue;
- verbose_print_pkg(p->pkg, 0);
- ok = 1;
+ if (!p->pkg->ipkg) continue;
+ ok = apk_dep_is_provided(&dep, p);
+ if (ok) verbose_print_pkg(p->pkg, 0);
+ break;
}
if (!ok) ctx->errors++;
}