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

code factorization

Browse Source
This commit is contained in:
Aurelien Foret 2006-02-07 19:08:02 +00:00
parent f34d895dc5
commit bbb48a85f0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libalpm/sync.c
View File

@ -478,6 +478,7 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
* (not the same behavior as in pacman 2.x) */ * (not the same behavior as in pacman 2.x) */
} else { } else {
char *rmpkg = NULL; char *rmpkg = NULL;
char *target, *depend;
/* hmmm, depend.name isn't installed, so it must be conflicting /* hmmm, depend.name isn't installed, so it must be conflicting
* with another package in our final list. For example: * with another package in our final list. For example:
* *
@ -491,18 +492,18 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
/* figure out which one was requested in targets. If they both were, /* figure out which one was requested in targets. If they both were,
* then it's still an unresolvable conflict. */ * then it's still an unresolvable conflict. */
if(pm_list_is_strin(miss->depend.name, trans->targets) target = pm_list_is_strin(miss->depend.name, trans->targets);
&& !pm_list_is_strin(miss->target, trans->targets)) { depend = pm_list_is_strin(miss->target, trans->targets);
if(depend && !target) {
_alpm_log(PM_LOG_DEBUG, "%s is in the target list -- keeping it", _alpm_log(PM_LOG_DEBUG, "%s is in the target list -- keeping it",
miss->depend.name); miss->depend.name);
/* remove miss->target */ /* remove miss->target */
rmpkg = strdup(miss->target); rmpkg = miss->target;
} else if(pm_list_is_strin(miss->target, trans->targets) } else if(target && !depend) {
&& !pm_list_is_strin(miss->depend.name, trans->targets)) {
_alpm_log(PM_LOG_DEBUG, "%s is in the target list -- keeping it", _alpm_log(PM_LOG_DEBUG, "%s is in the target list -- keeping it",
miss->target); miss->target);
/* remove miss->depend.name */ /* remove miss->depend.name */
rmpkg = strdup(miss->depend.name); rmpkg = miss->depend.name;
} else { } else {
/* something's not right, bail out with a conflict error */ /* something's not right, bail out with a conflict error */
} }
@ -512,7 +513,6 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
_alpm_log(PM_LOG_FLOW2, "removing %s from target list", rmpkg); _alpm_log(PM_LOG_FLOW2, "removing %s from target list", rmpkg);
trans->packages = _alpm_list_remove(trans->packages, rsync, ptr_cmp, (void **)&spkg); trans->packages = _alpm_list_remove(trans->packages, rsync, ptr_cmp, (void **)&spkg);
FREESYNC(spkg); FREESYNC(spkg);
FREE(rmpkg);
continue; continue;
} }
} }