diff options
| author | Dan McGee <dan@archlinux.org> | 2010-10-13 22:46:04 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-10-13 22:46:04 -0500 |
| commit | 68b50c81c79bcf01db0fd66ff523f32cc0dc67e9 (patch) | |
| tree | e11e6be57e2ff49a67390e4659801190a0282375 /lib/libalpm/remove.c | |
| parent | 6eedf06fcc224648155bc5253d6fe1975be8da00 (diff) | |
| parent | 24d77291da93fcd5d09df2b1d1d05474616f18a5 (diff) | |
| download | pacman-68b50c81c79bcf01db0fd66ff523f32cc0dc67e9.tar.xz | |
Merge remote branch 'allan/backend'
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dfaba03a..b53d85a6 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -42,7 +42,6 @@ #include "backup.h" #include "package.h" #include "db.h" -#include "cache.h" #include "deps.h" #include "handle.h" #include "alpm.h" @@ -348,7 +347,7 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, "updating database\n"); _alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); - if(_alpm_db_remove(handle->db_local, oldpkg) == -1) { + if(_alpm_local_db_remove(handle->db_local, oldpkg) == -1) { _alpm_log(PM_LOG_ERROR, _("could not remove database entry %s-%s\n"), pkgname, alpm_pkg_get_version(oldpkg)); } @@ -443,7 +442,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, "updating database\n"); _alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); - if(_alpm_db_remove(db, info) == -1) { + if(_alpm_local_db_remove(db, info) == -1) { _alpm_log(PM_LOG_ERROR, _("could not remove database entry %s-%s\n"), pkgname, alpm_pkg_get_version(info)); } |