Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/sync.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 3eadfdf1..7f770f1c 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -456,10 +456,12 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
/* figure out which one was requested in targets. If they both were,
* then it's still an unresolvable conflict. */
- if(pm_list_is_in(miss->depend.name, trans->targets) && !pm_list_is_in(miss->target, trans->targets)) {
+ if(pm_list_is_strin(miss->depend.name, trans->targets)
+ && !pm_list_is_strin(miss->target, trans->targets)) {
/* remove miss->target */
rmpkg = strdup(miss->target);
- } else if(pm_list_is_in(miss->target, trans->targets) && !pm_list_is_in(miss->depend.name, trans->targets)) {
+ } else if(pm_list_is_strin(miss->target, trans->targets)
+ && !pm_list_is_strin(miss->depend.name, trans->targets)) {
/* remove miss->depend.name */
rmpkg = strdup(miss->depend.name);
} else {