From 9bddaac93c927d00804094b365c798b81dc0b408 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 21 Feb 2016 16:43:36 +1000 Subject: Use versions specified in optdepends Checking install status and if a package is optionally required on removal now considers the version of the optdepend. Fixes FS#44957. Signed-off-by: Allan McRae (cherry picked from commit 3da06c3519ad8df60ce8c067cdaeddb69a320a53) --- src/pacman/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/pacman/util.c b/src/pacman/util.c index e613c759..e2c99003 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1201,9 +1201,9 @@ static char *make_optstring(alpm_depend_t *optdep) alpm_db_t *localdb = alpm_get_localdb(config->handle); char *optstring = alpm_dep_compute_string(optdep); char *status = NULL; - if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optstring)) { status = _(" [installed]"); - } else if(alpm_find_satisfier(alpm_trans_get_add(config->handle), optdep->name)) { + } else if(alpm_find_satisfier(alpm_trans_get_add(config->handle), optstring)) { status = _(" [pending]"); } if(status) { -- cgit v1.2.3-70-g09d2