Signed-off-by: Ronan Pigott
---
Changes from v1:
1. Use forward declarations
2. Drop the unnecessary error message
src/pacman/pacman.c | 1 -
src/pacman/query.c | 6 ++++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index e5c6e4200932..320c7654e0a7 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -608,7 +608,6 @@ static void checkargs_query(void)
} else if(config->op_q_owns) {
invalid_opt(config->group, "--owns", "--groups");
checkargs_query_display_opts("--owns");
- checkargs_query_filter_opts("--owns");
} else if(config->group) {
checkargs_query_display_opts("--groups");
}
diff --git a/src/pacman/query.c b/src/pacman/query.c
index d75c4c801be5..e79b956838a0 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -135,6 +135,9 @@ cleanup:
return (success ? resolved_path : NULL);
}
+static int is_unrequired(alpm_pkg_t *pkg, unsigned short level);
+static int filter(alpm_pkg_t *pkg);
+
static int query_fileowner(alpm_list_t *targets)
{
int ret = 0;
@@ -210,6 +213,9 @@ static int query_fileowner(alpm_list_t *targets)
}
for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) {
+ if (!filter(i->data)) {
+ continue;
+ }
if(alpm_filelist_contains(alpm_pkg_get_files(i->data), rel_path)) {
print_query_fileowner(rpath, i->data);
found = 1;
--
2.41.0