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

more work in sync_prepare

Browse Source
This commit is contained in:
Aurelien Foret 2005-04-08 19:37:23 +00:00
parent 405d3c9a9f
commit 3e77af5182
1 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/libalpm/sync.c
View File

@ -204,7 +204,7 @@ int sync_sysupgrade(PMList **data)
pm_errno = PM_ERR_MEMORY; pm_errno = PM_ERR_MEMORY;
goto error; goto error;
} }
_alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (upgrade: %s => %s)", _alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (%s => %s)",
local->name, local->version, local->version, spkg->version); local->name, local->version, local->version, spkg->version);
targets = pm_list_add(targets, sync); targets = pm_list_add(targets, sync);
} }
@ -234,6 +234,7 @@ int sync_addtarget(pmdb_t *db, PMList *dbs_sync, pmtrans_t *trans, char *name)
ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
if(trans->flags & PM_TRANS_FLAG_SYSUPG) { if(trans->flags & PM_TRANS_FLAG_SYSUPG) {
RET_ERR(PM_ERR_XXX, -1);
} }
strncpy(targline, name, (PKG_NAME_LEN-1)+1+(DB_TREENAME_LEN-1)+1); strncpy(targline, name, (PKG_NAME_LEN-1)+1+(DB_TREENAME_LEN-1)+1);
@ -255,9 +256,6 @@ int sync_addtarget(pmdb_t *db, PMList *dbs_sync, pmtrans_t *trans, char *name)
for(j = dbs_sync; j && !spkg; j = j->next) { for(j = dbs_sync; j && !spkg; j = j->next) {
pmdb_t *dbs = j->data; pmdb_t *dbs = j->data;
spkg = db_get_pkgfromcache(dbs, targ); spkg = db_get_pkgfromcache(dbs, targ);
if(spkg == NULL) {
continue;
}
} }
} }
if(spkg == NULL) { if(spkg == NULL) {
@ -284,12 +282,12 @@ int sync_addtarget(pmdb_t *db, PMList *dbs_sync, pmtrans_t *trans, char *name)
} }
} }
/* add the package to the transaction */
if(!find_pkginsync(spkg->name, trans->packages)) {
sync = sync_new(PM_SYNC_TYPE_UPGRADE, local, spkg); sync = sync_new(PM_SYNC_TYPE_UPGRADE, local, spkg);
if(sync == NULL) { if(sync == NULL) {
RET_ERR(PM_ERR_MEMORY, -1); RET_ERR(PM_ERR_MEMORY, -1);
} }
/* add the package to the transaction */
if(!find_pkginsync(sync->spkg->name, trans->packages)) {
trans->packages = pm_list_add(trans->packages, sync); trans->packages = pm_list_add(trans->packages, sync);
} }
@ -305,11 +303,19 @@ int sync_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(data != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
*data = NULL;
if(trans->packages == NULL) { if(trans->packages == NULL) {
return(0); return(0);
} }
for(i = trans->packages; i; i = i->next) {
pmsyncpkg_t *sync = i->data;
list = pm_list_add(list, sync->spkg);
}
/* Resolve targets dependencies */ /* Resolve targets dependencies */
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
TRANS_CB(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL); TRANS_CB(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL);
@ -319,17 +325,28 @@ int sync_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
list = pm_list_add(list, sync->spkg); list = pm_list_add(list, sync->spkg);
} }
trail = pm_list_new(); trail = pm_list_new();
for(i = list; i; i = i->next) {
pmpkg_t *spkg = i->data; for(i = trans->packages; i; i = i->next) {
pmsyncpkg_t *sync = i->data;
pmpkg_t *spkg = sync->spkg;
_alpm_log(PM_LOG_FLOW1, "resolving dependencies for package %s", spkg->name); _alpm_log(PM_LOG_FLOW1, "resolving dependencies for package %s", spkg->name);
if(resolvedeps(handle->db_local, handle->dbs_sync, spkg, trans->packages, trail) == -1) { if(resolvedeps(handle->db_local, handle->dbs_sync, spkg, list, trail) == -1) {
/* pm_errno is set by resolvedeps */ /* pm_errno is set by resolvedeps */
goto error; goto error;
} }
/* ORE /* ORE
if called from makepkg, reason should be set to REASON_DEPEND */ if called from makepkg, reason should be set to REASON_DEPEND
spkg->reason = PM_PKG_REASON_EXPLICIT; spkg->reason = PM_PKG_REASON_EXPLICIT;*/
} }
for(i = list; i; i = i->next) {
pmpkg_t *spkg = i->data;
if(!find_pkginsync(spkg->name, trans->packages)) {
pmsyncpkg_t *sync = sync_new(PM_SYNC_TYPE_DEPEND, NULL, spkg);
trans->packages = pm_list_add(trans->packages, sync);
}
}
FREELISTPTR(list); FREELISTPTR(list);
FREELISTPTR(trail); FREELISTPTR(trail);
@ -338,35 +355,29 @@ int sync_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
/* ORE /* ORE
check for inter-conflicts and whatnot */ check for inter-conflicts and whatnot */
for(i = trans->packages; i; i = i->next) { _alpm_log(PM_LOG_FLOW1, "looking for inter-conflicts");
pmsyncpkg_t *sync = i->data;
if(sync) {
list = pm_list_add(list, sync->spkg);
}
}
deps = checkdeps(db, PM_TRANS_TYPE_UPGRADE, list); deps = checkdeps(db, PM_TRANS_TYPE_UPGRADE, list);
if(deps) { if(deps) {
int errorout = 0; int errorout = 0;
for(i = deps; i; i = i->next) { for(i = deps; i; i = i->next) {
pmdepmissing_t *miss = i->data; pmdepmissing_t *miss = i->data;
if(miss->type == PM_DEP_TYPE_DEPEND || miss->type == PM_DEP_TYPE_REQUIRED) { if(miss->type == PM_DEP_TYPE_DEPEND || miss->type == PM_DEP_TYPE_REQUIRED) {
/*if(!errorout) { if(!errorout) {
fprintf(stderr, "error: unresolvable dependencies:\n");
errorout = 1; errorout = 1;
} }
fprintf(stderr, " %s: requires %s", miss->target, miss->depend.name); if((miss = (pmdepmissing_t *)malloc(sizeof(pmdepmissing_t))) == NULL) {
switch(miss->depend.mod) { FREELIST(deps);
case PM_DEP_MOD_EQ: fprintf(stderr, "=%s", miss->depend.version); break; FREELIST(*data);
case PM_DEP_MOD_GE: fprintf(stderr, ">=%s", miss->depend.version); break; RET_ERR(PM_ERR_MEMORY, -1);
case PM_DEP_MOD_LE: fprintf(stderr, "<=%s", miss->depend.version); break;
} }
if(miss->type == PM_DEP_TYPE_DEPEND) { *miss = *(pmdepmissing_t *)i->data;
fprintf(stderr, " but it is not in the sync db\n"); *data = pm_list_add(*data, miss);
} else {
fprintf(stderr, "\n");
}*/
} }
} }
if(errorout) {
FREELIST(deps);
RET_ERR(PM_ERR_UNSATISFIED_DEPS, -1);
}
/* ORE /* ORE
then look for conflicts */ then look for conflicts */
} }