mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-22 15:58:50 -05:00
Fixed a regression in the conflict handling code
This commit is contained in:
parent
bde9d69636
commit
02694534be
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user