Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pacman/package.c3
-rw-r--r--src/pacman/util.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/pacman/package.c b/src/pacman/package.c
index 33184bd5..2fd0a9c3 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -57,11 +57,12 @@ static void deplist_display(const char *title,
static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols)
{
alpm_list_t *i, *text = NULL;
+ alpm_db_t *localdb = alpm_get_localdb(config->handle);
for(i = alpm_pkg_get_optdepends(pkg); i; i = alpm_list_next(i)) {
alpm_depend_t *optdep = i->data;
char *depstring = alpm_dep_compute_string(optdep);
if(alpm_pkg_get_origin(pkg) == ALPM_PKG_FROM_LOCALDB) {
- if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name)) {
+ if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) {
const char *installed = _(" [installed]");
depstring = realloc(depstring, strlen(depstring) + strlen(installed) + 1);
strcpy(depstring + strlen(depstring), installed);
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 7c6a8c0d..9fdc39a5 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -1204,9 +1204,10 @@ static int depend_cmp(const void *d1, const void *d2)
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_db_get_pkg(alpm_get_localdb(config->handle), optdep->name)) {
+ if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) {
status = _(" [installed]");
} else if(alpm_pkg_find(alpm_trans_get_add(config->handle), optdep->name)) {
status = _(" [pending]");