[pacman-dev] [PATCHv2] libalpm: Fix installing update of a replaced package

[Olivier Brunel]

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 at gmail.com>
---
 lib/libalpm/sync.c            |  2 ++
 test/pacman/tests/sync1104.py | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 test/pacman/tests/sync1104.py

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 204456d..2a56115 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 0000000..5cec98a
--- /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")
-- 
1.8.1.5