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

- added transaction flags for the removal of a package to be upgrade

Browse Source 
- reworked some comments
This commit is contained in:
Aurelien Foret 2005-04-03 08:19:10 +00:00
parent d9a96064ab
commit a98c5c25b5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libalpm/add.c
View File

@ -252,8 +252,8 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
/* we'll need the full record for backup checks later */ /* we'll need the full record for backup checks later */
/* ORE /* ORE
in fact, there's only a need for "backup" and "md5sum" fields, so in fact, there's only a need for "version", "backup" and "reason" fields,
we should only copy these 2 ones from info, and thus save a call so we should only copy them from the cache, and thus save a call
to db_scan(ALL) */ to db_scan(ALL) */
oldpkg = db_scan(db, info->name, INFRQ_ALL); oldpkg = db_scan(db, info->name, INFRQ_ALL);
@ -266,13 +266,11 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
pmtrans_t *tr; pmtrans_t *tr;
_alpm_log(PM_LOG_FLOW1, "removing old package first"); _alpm_log(PM_LOG_FLOW1, "removing old package first");
/* ORE
set flags to something, but what (nodeps?) ??? */
tr = trans_new(); tr = trans_new();
if(tr == NULL) { if(tr == NULL) {
RET_ERR(PM_ERR_TRANS_ABORT, -1); RET_ERR(PM_ERR_TRANS_ABORT, -1);
} }
if(trans_init(tr, PM_TRANS_TYPE_UPGRADE, 0, NULL) == -1) { if(trans_init(tr, PM_TRANS_TYPE_UPGRADE, trans->flags, NULL) == -1) {
FREETRANS(tr); FREETRANS(tr);
RET_ERR(PM_ERR_TRANS_ABORT, -1); RET_ERR(PM_ERR_TRANS_ABORT, -1);
} }
@ -347,16 +345,16 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
alpm_logaction(NULL, "error updating database for %s-%s!", info->name, info->version); alpm_logaction(NULL, "error updating database for %s-%s!", info->name, info->version);
RET_ERR(PM_ERR_DB_WRITE, -1); RET_ERR(PM_ERR_DB_WRITE, -1);
} }
/* ORE /* ORE
in case of an installation, then add info in the pkgcache in case of an installation, then add info in the pkgcache
in case of an upgrade, then replace the existing one (or just add because in case of an upgrade, then replace the existing one (or just add because
trans_remove should already has removed it? */ trans_remove should already has removed it?
something like db_cache_addpkg(db, pkgdup(info)); (should also free db->grpcache) */
/* update dependency packages' REQUIREDBY fields */ /* update dependency packages' REQUIREDBY fields */
_alpm_log(PM_LOG_FLOW2, "updating dependency packages 'requiredby' fields"); _alpm_log(PM_LOG_FLOW2, "updating dependency packages 'requiredby' fields");
for(lp = info->depends; lp; lp = lp->next) { for(lp = info->depends; lp; lp = lp->next) {
pmpkg_t *depinfo = NULL; pmpkg_t *depinfo;
pmdepend_t depend; pmdepend_t depend;
if(splitdep(lp->data, &depend)) { if(splitdep(lp->data, &depend)) {
@ -373,6 +371,9 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
cache, thus eliminating the need for db_scan(DEPENDS) */ cache, thus eliminating the need for db_scan(DEPENDS) */
PMList *provides = _alpm_db_whatprovides(db, depend.name); PMList *provides = _alpm_db_whatprovides(db, depend.name);
if(provides) { if(provides) {
/* TODO: should check _all_ packages listed in provides, not just
* the first one.
*/
/* use the first one */ /* use the first one */
depinfo = db_scan(db, ((pmpkg_t *)provides->data)->name, INFRQ_DESC|INFRQ_DEPENDS); depinfo = db_scan(db, ((pmpkg_t *)provides->data)->name, INFRQ_DESC|INFRQ_DEPENDS);
FREELISTPTR(provides); FREELISTPTR(provides);