diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-09 23:00:55 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-14 02:32:59 +0200 |
| commit | fb3ad7f8823dd3300528b44427d40e17594b1400 (patch) | |
| tree | 8932518e67553383a178d23fcdd07beb24dc801e /src/pacman | |
| parent | 01ad3faee934aa805237bf5405e7c74dc1482a17 (diff) | |
| download | pacman-fb3ad7f8823dd3300528b44427d40e17594b1400.tar.gz pacman-fb3ad7f8823dd3300528b44427d40e17594b1400.tar.xz | |
Add handle argument to alpm_(add|remove)_pkg()
This makes these functions consistent with the rest of the transaction
related API calls. We do an additional assert to ensure the handle
attached to the package is the same as the handle passed in.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman')
| -rw-r--r-- | src/pacman/remove.c | 4 | ||||
| -rw-r--r-- | src/pacman/sync.c | 2 | ||||
| -rw-r--r-- | src/pacman/upgrade.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/pacman/remove.c b/src/pacman/remove.c index b96687ae..6da3b044 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -38,7 +38,7 @@ static int remove_target(const char *target) alpm_list_t *p; if((info = alpm_db_get_pkg(db_local, target)) != NULL) { - if(alpm_remove_pkg(info) == -1) { + if(alpm_remove_pkg(config->handle, info) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", target, alpm_strerrorlast()); return -1; } @@ -53,7 +53,7 @@ static int remove_target(const char *target) } for(p = alpm_grp_get_pkgs(grp); p; p = alpm_list_next(p)) { pmpkg_t *pkg = alpm_list_getdata(p); - if(alpm_remove_pkg(pkg) == -1) { + if(alpm_remove_pkg(config->handle, pkg) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", target, alpm_strerrorlast()); return -1; } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4cd8d212..57fec4bc 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -620,7 +620,7 @@ static pmdb_t *get_db(const char *dbname) static int process_pkg(pmpkg_t *pkg) { - int ret = alpm_add_pkg(pkg); + int ret = alpm_add_pkg(config->handle, pkg); if(ret == -1) { if(pm_errno == PM_ERR_TRANS_DUP_TARGET diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index ddb8a2e8..fe49d882 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -82,7 +82,7 @@ int pacman_upgrade(alpm_list_t *targets) trans_release(); return 1; } - if(alpm_add_pkg(pkg) == -1) { + if(alpm_add_pkg(config->handle, pkg) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ, alpm_strerrorlast()); alpm_pkg_free(pkg); |