diff options
| author | Dan McGee <dan@archlinux.org> | 2011-02-04 09:10:25 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-02-04 09:10:25 -0600 |
| commit | e34fc4eddf73f2453b42235f5ae7d65f75db66fc (patch) | |
| tree | 93b3a31a7db207f70b0a024f4de83ff8e0e3158f /src/util | |
| parent | c12ccbfb2c7aa907ba01339a1a29089c65ea9911 (diff) | |
| parent | 6b0d4674bb132b2583920211cc798f3db77ec392 (diff) | |
| download | pacman-e34fc4eddf73f2453b42235f5ae7d65f75db66fc.tar.xz | |
Merge remote-tracking branch 'allan/hash'
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/cleanupdelta.c | 2 | ||||
| -rw-r--r-- | src/util/pactree.c | 4 | ||||
| -rw-r--r-- | src/util/testdb.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4403e9fa..36a4e072 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -79,7 +79,7 @@ static void checkdbs(char *dbpath, alpm_list_t *dbnames) { alpm_strerrorlast()); return; } - checkpkgs(alpm_db_get_pkgcache(db)); + checkpkgs(alpm_db_get_pkgcache_list(db)); } } diff --git a/src/util/pactree.c b/src/util/pactree.c index 6a10006f..947ed61c 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -303,7 +303,7 @@ static void walk_deps(pmpkg_t *pkg, int depth) for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { pmdepend_t *depend = alpm_list_getdata(i); - pmpkg_t *provider = alpm_find_satisfier(alpm_db_get_pkgcache(db_local), + pmpkg_t *provider = alpm_find_satisfier(alpm_db_get_pkgcache_list(db_local), alpm_dep_get_name(depend)); if(provider) { @@ -347,7 +347,7 @@ int main(int argc, char *argv[]) /* we only care about the first non option arg for walking */ target_name = argv[optind]; - pkg = alpm_find_satisfier(alpm_db_get_pkgcache(db_local), target_name); + pkg = alpm_find_satisfier(alpm_db_get_pkgcache_list(db_local), target_name); if(!pkg) { fprintf(stderr, "error: package '%s' not found\n", target_name); ret = 1; diff --git a/src/util/testdb.c b/src/util/testdb.c index 461cf23a..124a66dd 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -142,7 +142,7 @@ static int check_localdb(void) { alpm_strerrorlast()); cleanup(EXIT_FAILURE); } - pkglist = alpm_db_get_pkgcache(db); + pkglist = alpm_db_get_pkgcache_list(db); ret += checkdeps(pkglist); ret += checkconflicts(pkglist); return(ret); @@ -162,7 +162,7 @@ static int check_syncdbs(alpm_list_t *dbnames) { ret = 1; goto cleanup; } - pkglist = alpm_db_get_pkgcache(db); + pkglist = alpm_db_get_pkgcache_list(db); syncpkglist = alpm_list_join(syncpkglist, alpm_list_copy(pkglist)); } ret += checkdeps(syncpkglist); |