diff options
| author | Olivier Brunel <i.am.jack.mail@gmail.com> | 2013-03-03 22:46:19 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-03-07 06:38:47 +0100 |
| commit | 1b39653e9624db98c2e707a1991bc32bb26f2b67 (patch) | |
| tree | 801ba006ea74ba92ab16dcc6994f9861eed1b651 | |
| parent | a98bb96b434d788d1599e622c33dce851113fabd (diff) | |
| download | pacman-1b39653e9624db98c2e707a1991bc32bb26f2b67.tar.gz pacman-1b39653e9624db98c2e707a1991bc32bb26f2b67.tar.xz | |
libalpm: Fix installing update of a replaced package
During a sysupgrade, if a package is replaced by another, and an update for the
former package is found (on another repo) the replaced package would be
re-installed.
Signed-off-by: Olivier Brunel <i.am.jack.mail@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/sync.c | 2 | ||||
| -rw-r--r-- | test/pacman/tests/sync1104.py | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 204456d6..2a56115b 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -396,6 +396,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_pkg_t *spkg = i->data; for(j = spkg->removes; j; j = j->next) { remove = alpm_list_add(remove, j->data); + /* do not re-install a (replaced) package even if an update is available */ + trans->add = alpm_list_remove(trans->add, j->data, _alpm_pkg_cmp, NULL); } } diff --git a/test/pacman/tests/sync1104.py b/test/pacman/tests/sync1104.py new file mode 100644 index 00000000..5cec98ad --- /dev/null +++ b/test/pacman/tests/sync1104.py @@ -0,0 +1,18 @@ +self.description = "Don't update (reinstall) a replaced package" + +lp = pmpkg("old", "1-1") +self.addpkg2db("local", lp) + +p1 = pmpkg("new") +p1.provides = ["old"] +p1.replaces = ["old"] +self.addpkg2db("sync1", p1) + +p2 = pmpkg("old", "1-2") +self.addpkg2db("sync2", p2) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=old") +self.addrule("PKG_EXIST=new") |