moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 03:54:59 -05:00
Code Issues Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Aurelien Foret 2006-01-02 21:33:58 +00:00
parent 5eb29e2127
commit f48aced5b2
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/libalpm/sync.c
View File

@ -382,7 +382,7 @@ 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; int found = 0;
PMList *j, *k; PMList *j, *k;
int errorout = 0; int errorout = 0;
@ -418,16 +418,14 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
/* check if the conflicting package is one that's about to be removed/replaced. /* check if the conflicting package is one that's about to be removed/replaced.
* if so, then just ignore it * if so, then just ignore it
*/ */
found = 0;
for(j = trans->packages; j && !found; j = j->next) { for(j = trans->packages; j && !found; j = j->next) {
pmsyncpkg_t *sync = j->data; pmsyncpkg_t *sync = j->data;
if(sync->type != PM_SYNC_TYPE_REPLACE) { if(sync->type == PM_SYNC_TYPE_REPLACE || sync->type == PM_SYNC_TYPE_REMOVE) {
continue; for(k = sync->data; k && !found; k = k->next) {
} pmpkg_t *p = k->data;
for(k = sync->data; k && !found; k = k->next) { if(!strcmp(p->name, miss->depend.name)) {
pmpkg_t *p = k->data; found = 1;
if(!strcmp(p->name, miss->depend.name)) { }
found = 1;
} }
} }
} }
@ -479,8 +477,11 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
if(rmpkg) { if(rmpkg) {
for(k = trans->packages; k; k = k->next) { for(k = trans->packages; k; k = k->next) {
pmsyncpkg_t *sync = k->data; pmsyncpkg_t *sync = k->data;
if(!strcmp(sync->pkg->name, rmpkg)) if(!strcmp(sync->pkg->name, rmpkg)) {
trans->packages = _alpm_list_remove(trans->packages, sync, ptr_cmp, (void **)&data); pmsyncpkg_t *spkg;
trans->packages = _alpm_list_remove(trans->packages, sync, ptr_cmp, (void **)&spkg);
FREESYNC(spkg);
}
} }
solved = 1; solved = 1;
FREE(rmpkg); FREE(rmpkg);
@ -599,7 +600,7 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local)
goto error; goto error;
} }
trans_init(tr, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS, trans->cb_event, trans->cb_conv); trans_init(tr, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS, NULL, NULL);
for(i = trans->packages; i; i = i->next) { for(i = trans->packages; i; i = i->next) {
pmsyncpkg_t *sync = i->data; pmsyncpkg_t *sync = i->data;