moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Olivier Brunel 2013-03-03 22:46:19 +01:00 committed by Allan McRae
parent a98bb96b43
commit 1b39653e96
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/sync.c
View File

@ -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);
}
}

18
test/pacman/tests/sync1104.py Normal file
View File

@ -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")