diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 19:01:26 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 19:01:26 +0100 |
| commit | 02694534be2c9822a5129cb536c057712aa85d95 (patch) | |
| tree | afbdc6af61fb986bdc99bcb50d78a2c3fb3c55df | |
| parent | bde9d69636a2f1842be83e4cd36188b66df74e26 (diff) | |
| download | pacman-02694534be2c9822a5129cb536c057712aa85d95.tar.gz pacman-02694534be2c9822a5129cb536c057712aa85d95.tar.xz | |
Fixed a regression in the conflict handling code
| -rw-r--r-- | lib/libalpm/sync.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |