diff options
| -rw-r--r-- | expac.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -492,11 +492,7 @@ alpm_list_t *resolve_pkg(alpm_list_t *targets) { } else { /* dump full DBs */ for (r = dblist; r; r = alpm_list_next(r)) { /* joining causes corruption on alpm_release(), so we copy */ -#ifdef _HAVE_ALPM_DB_GET_PKGCACHE_LIST - ret = alpm_list_join(ret, alpm_list_copy(alpm_db_get_pkgcache_list(alpm_list_getdata(r)))); -#else ret = alpm_list_join(ret, alpm_list_copy(alpm_db_get_pkgcache(alpm_list_getdata(r)))); -#endif } } } else { @@ -518,10 +514,10 @@ alpm_list_t *resolve_pkg(alpm_list_t *targets) { } pkg = alpm_db_get_pkg(repo, pkgname); -#if defined(_HAVE_ALPM_FIND_SATISFIER) && defined(_HAVE_ALPM_DB_GET_PKGCACHE_LIST) +#ifdef _HAVE_ALPM_FIND_SATISFIER /* try to resolve as provide (e.g. awk => gawk) */ if (!pkg) { - pkg = alpm_find_satisfier(alpm_db_get_pkgcache_list(repo), pkgname); + pkg = alpm_find_satisfier(alpm_db_get_pkgcache(repo), pkgname); } #endif |