From 2330a6458976f20e6039ddbb5a0e00ea939b392a Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Mon, 3 Mar 2014 18:29:08 -0500 Subject: sync_prepare: ignore explicitly removed conflicts Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- lib/libalpm/sync.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 718f9af2..7e40d986 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -566,6 +566,9 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* if conflict->package2 (the local package) is not elected for removal, we ask the user */ + if(alpm_pkg_find(trans->remove, conflict->package2)) { + found = 1; + } for(j = trans->add; j && !found; j = j->next) { alpm_pkg_t *spkg = j->data; if(alpm_pkg_find(spkg->removes, conflict->package2)) { -- cgit v1.2.3-70-g09d2