[pacman-dev] [PATCH] sync_prepare: ignore explicitly removed conflicts

[Andrew Gregory]

Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
---
 lib/libalpm/sync.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 6ea78a0..31181e1 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)) {
-- 
1.9.0