Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-03-03 18:29:08 -0500
committerAllan McRae <allan@archlinux.org>2014-03-04 13:57:02 +1000
commit2330a6458976f20e6039ddbb5a0e00ea939b392a (patch)
treedc949a9742945298c71df253481ef1cf8a7e45d2
parent1afddd74a978631ff4f15d450b96d66e7af1e768 (diff)
sync_prepare: ignore explicitly removed conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/sync.c3
1 files changed, 3 insertions, 0 deletions
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)) {