diff options
| author | Dan McGee <dan@archlinux.org> | 2011-07-06 16:18:59 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-07-06 16:26:09 +0200 |
| commit | 00628c7268e3b81045961be51a0ca640aea368b0 (patch) | |
| tree | 96f4d57d6c9852e7bf1d7a2fb9676401cc859244 /lib/libalpm/add.c | |
| parent | 1d53dd716d7c7bea297a532809c4557b805a9918 (diff) | |
| download | pacman-00628c7268e3b81045961be51a0ca640aea368b0.tar.gz pacman-00628c7268e3b81045961be51a0ca640aea368b0.tar.xz | |
Unify package removal code
This code duplication has always been a rather clumsy casuality of
fixing some past upgrade issues. Unify the removal code across upgrade
and remove operations into a new _alpm_remove_single_package() method
wihch makes it very clear how we handle upgrade and remove differently,
via several conditionals on newpkg.
This commit highlights interesting behavior such as the fact that the
implicit removal in every package upgrade never gets transaction events
or progress callbacks.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 9ed4d818..e1827469 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -506,7 +506,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(oldpkg) { /* set up fake remove transaction */ - if(_alpm_upgraderemove_package(handle, oldpkg, newpkg) == -1) { + if(_alpm_remove_single_package(handle, oldpkg, newpkg, 0, 0) == -1) { handle->pm_errno = ALPM_ERR_TRANS_ABORT; ret = -1; goto cleanup; |