moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

Fixed a regression in the conflict handling code

Browse Source
This commit is contained in:
Aurelien Foret 2006-01-07 18:01:26 +00:00
parent bde9d69636
commit 02694534be
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/sync.c
View File

@ -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); EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL);
deps = checkdeps(db_local, PM_TRANS_TYPE_UPGRADE, list); deps = checkdeps(db_local, PM_TRANS_TYPE_UPGRADE, list);
if(deps) { if(deps) {
int found = 0;
int errorout = 0; int errorout = 0;
_alpm_log(PM_LOG_FLOW1, "looking for unresolvable dependencies"); _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) { for(i = deps; i && !errorout; i = i->next) {
pmdepmissing_t *miss = i->data; pmdepmissing_t *miss = i->data;
PMList *k; PMList *k;
int found = 0;
if(miss->type != PM_DEP_TYPE_CONFLICT) { if(miss->type != PM_DEP_TYPE_CONFLICT) {
continue; continue;