From 02694534be2c9822a5129cb536c057712aa85d95 Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Sat, 7 Jan 2006 18:01:26 +0000 Subject: Fixed a regression in the conflict handling code --- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a743099a..7cbcf8a0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -386,7 +386,6 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList ** EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); deps = checkdeps(db_local, PM_TRANS_TYPE_UPGRADE, list); if(deps) { - int found = 0; int errorout = 0; _alpm_log(PM_LOG_FLOW1, "looking for unresolvable dependencies"); @@ -415,6 +414,7 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList ** for(i = deps; i && !errorout; i = i->next) { pmdepmissing_t *miss = i->data; PMList *k; + int found = 0; if(miss->type != PM_DEP_TYPE_CONFLICT) { continue; -- cgit v1.2.3-24-g4f1b