From 7501f6012fc06ebfa8c6d8f928f38318267abe72 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Mon, 9 Nov 2015 10:03:31 +0200 Subject: search: match packages only once fixes #4770 apk_name_foreach_matching() can matches each package via it's main name and all it's provides. Print matched packages only once. --- src/search.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/search.c b/src/search.c index 2e47070..62ca816 100644 --- a/src/search.c +++ b/src/search.c @@ -29,8 +29,16 @@ struct search_ctx { struct apk_string_array *filter; }; +static int unique_match(struct apk_package *pkg) +{ + if (pkg->state_int) return 0; + pkg->state_int = 1; + return 1; +} + static void print_package_name(struct search_ctx *ctx, struct apk_package *pkg) { + if (!unique_match(pkg)) return; printf("%s", pkg->name->name); if (apk_verbosity > 0) printf("-" BLOB_FMT, BLOB_PRINTF(*pkg->version)); @@ -41,6 +49,7 @@ static void print_package_name(struct search_ctx *ctx, struct apk_package *pkg) static void print_origin_name(struct search_ctx *ctx, struct apk_package *pkg) { + if (!unique_match(pkg)) return; if (pkg->origin != NULL) printf(BLOB_FMT, BLOB_PRINTF(*pkg->origin)); else -- cgit v1.2.3