From 293762ea8b7e3d0abb00e9303e4013be50884211 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sun, 6 Feb 2022 10:30:37 -0800 Subject: [PATCH] query: only strip leading local/ for db packages Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- src/pacman/query.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0208d5b6..afcbbd4f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -468,11 +468,6 @@ int pacman_query(alpm_list_t *targets) for(i = targets; i; i = alpm_list_next(i)) { const char *strname = i->data; - /* strip leading part of "local/pkgname" */ - if(strncmp(strname, LOCAL_PREFIX, strlen(LOCAL_PREFIX)) == 0) { - strname += strlen(LOCAL_PREFIX); - } - if(config->op_q_isfile) { alpm_pkg_load(config->handle, strname, 1, 0, &pkg); @@ -482,6 +477,11 @@ int pacman_query(alpm_list_t *targets) alpm_strerror(alpm_errno(config->handle))); } } else { + /* strip leading part of "local/pkgname" */ + if(strncmp(strname, LOCAL_PREFIX, strlen(LOCAL_PREFIX)) == 0) { + strname += strlen(LOCAL_PREFIX); + } + pkg = alpm_db_get_pkg(db_local, strname); if(pkg == NULL) { pkg = alpm_find_satisfier(alpm_db_get_pkgcache(db_local), strname);