Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src/pacman/query.c
diff options
context:
space:
mode:
authormorganamilo <morganamilo@gmail.com>2019-11-06 01:42:11 +0000
committerAllan McRae <allan@archlinux.org>2019-11-08 16:32:55 +1000
commit27f354a7874b965bf223832bdf9749504cd1a590 (patch)
treebc3b4c976c71469185d5d7cefd5229888fed8375 /src/pacman/query.c
parent94982d0061890529cc22401b6763fb5e9ef4e7d1 (diff)
pacman+libalpm: handle search errors
Previously, pacman treated no matches and an error during search the same. To fix this, alpm_db_search now returns its status as an int and instead takes the to be returned list as a param. Allowing front ends to easily differentiate between errors and no matches. Signed-off-by: morganamilo <morganamilo@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/pacman/query.c')
-rw-r--r--src/pacman/query.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c
index 2b9ee7a6..bdcfc3c1 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -233,7 +233,15 @@ targcleanup:
static int query_search(alpm_list_t *targets)
{
alpm_db_t *db_local = alpm_get_localdb(config->handle);
- return dump_pkg_search(db_local, targets, 0);
+ int ret = dump_pkg_search(db_local, targets, 0);
+ if(ret == -1) {
+ alpm_errno_t err = alpm_errno(config->handle);
+ pm_printf(ALPM_LOG_ERROR, "search failed: %s\n", alpm_strerror(err));
+ return 1;
+ }
+
+ return ret;
+
}
static unsigned short pkg_get_locality(alpm_pkg_t *pkg)