Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/sync.c
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-01-16 22:27:09 +0000
committerAurelien Foret <aurelien@archlinux.org>2006-01-16 22:27:09 +0000
commit6e5a62dd128b6036eaa35f9b010a35120548e3db (patch)
tree1d419961d1eb80c57aa771756f41e59da145e8db /lib/libalpm/sync.c
parent9b2f0607d566bf95bbe14da6747771f7314bbbdc (diff)
more code cleanup
Diffstat (limited to 'lib/libalpm/sync.c')
-rw-r--r--lib/libalpm/sync.c26
1 files changed, 9 insertions, 17 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index d9df821f..45a02f2b 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -206,12 +206,7 @@ int sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync)
pmsyncpkg_t *sync;
for(j = dbs_sync; !spkg && j; j = j->next) {
- for(k = db_get_pkgcache(j->data); !spkg && k; k = k->next) {
- pmpkg_t *sp = k->data;
- if(!strcmp(local->name, sp->name)) {
- spkg = sp;
- }
- }
+ spkg = db_get_pkgfromcache(j->data, local->name);
}
if(spkg == NULL) {
_alpm_log(PM_LOG_DEBUG, "%s: not found in sync db -- skipping.", local->name);
@@ -393,8 +388,6 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
pmpkg_t *spkg = i->data;
if(!find_pkginsync(spkg->name, trans->packages)) {
pmsyncpkg_t *sync = sync_new(PM_SYNC_TYPE_DEPEND, spkg, NULL);
- /* ORE - the trans->packages list should be sorted to stay compatible with
- * pacman 2.x */
trans->packages = pm_list_add(trans->packages, sync);
_alpm_log(PM_LOG_FLOW2, "adding package %s-%s to the transaction targets",
spkg->name, spkg->version);
@@ -517,16 +510,13 @@ int sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PMList **
pmsyncpkg_t *s = k->data;
if(!strcmp(s->pkg->name, miss->target)) {
pmpkg_t *q = pkg_new(miss->depend.name, NULL);
- if(s->type == PM_SYNC_TYPE_REPLACE) {
- /* append to the replaces list */
- s->data = pm_list_add(s->data, q);
- } else {
+ if(s->type != PM_SYNC_TYPE_REPLACE) {
/* switch this sync type to REPLACE */
s->type = PM_SYNC_TYPE_REPLACE;
- /* add miss->depend.name to the replaces list */
- /* ORE - isn't the next line overwriting s->data? */
- s->data = pm_list_add(NULL, q);
+ FREEPKG(s->data);
}
+ /* append to the replaces list */
+ s->data = pm_list_add(s->data, q);
}
}
} else {
@@ -760,7 +750,8 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local, PMList **data)
}
}
if(db_write(db_local, depender, INFRQ_DEPENDS) == -1) {
- _alpm_log(PM_LOG_ERROR, "could not update 'requiredby' database entry %s/%s-%s", db_local->treename, new->name, new->version);
+ _alpm_log(PM_LOG_ERROR, "could not update 'requiredby' database entry %s-%s",
+ new->name, new->version);
}
/* add the new requiredby */
new->requiredby = pm_list_add(new->requiredby, strdup(k->data));
@@ -768,7 +759,8 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local, PMList **data)
}
}
if(db_write(db_local, new, INFRQ_DEPENDS) == -1) {
- _alpm_log(PM_LOG_ERROR, "could not update new database entry %s/%s-%s", db_local->treename, new->name, new->version);
+ _alpm_log(PM_LOG_ERROR, "could not update new database entry %s-%s",
+ new->name, new->version);
}
}
}