summaryrefslogtreecommitdiffstats
path: root/expac.c
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-02-26 09:36:03 -0500
committerDave Reisner <d@falconindy.com>2011-02-26 09:36:03 -0500
commit42f607046e0a515a5cb5de1305a82fc5580f3c2d (patch)
treeb08a9ffda14fda260ccfbb72c690e9a78bd4610d /expac.c
parent6009462840af7baf3700568d34aed325ee854b2a (diff)
downloadexpac-42f607046e0a515a5cb5de1305a82fc5580f3c2d.tar.xz
alpm_db_get_pkgcache_list has gone away
Diffstat (limited to 'expac.c')
-rw-r--r--expac.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/expac.c b/expac.c
index 6dfb7e6..e66f456 100644
--- a/expac.c
+++ b/expac.c
@@ -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