bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backport from pacman 2.9.5 (formatting, commentaries)

Browse source
This commit is contained in:
Aurelien Foret 2005-03-26 20:24:57 +00:00
parent d77f8be802
commit 7767095c59
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/libalpm/add.c
View file

@ -60,6 +60,7 @@ int add_loadtarget(pmdb_t *db, pmtrans_t *trans, char *name)
/* ORE /* ORE
load_pkg should be done only if pkg has to be added to the transaction */ load_pkg should be done only if pkg has to be added to the transaction */
_alpm_log(PM_LOG_FLOW2, "reading %s", name);
info = pkg_load(name); info = pkg_load(name);
if(info == NULL) { if(info == NULL) {
/* pm_errno is already set by pkg_load() */ /* pm_errno is already set by pkg_load() */
@ -73,7 +74,7 @@ int add_loadtarget(pmdb_t *db, pmtrans_t *trans, char *name)
} }
dummy = db_get_pkgfromcache(db, info->name); dummy = db_get_pkgfromcache(db, info->name);
/* only freshen this package if it is already installed and at a lesser version */ /* only upgrade/install this package if it is already installed and at a lesser version */
if(trans->flags & PM_TRANS_FLAG_FRESHEN) { if(trans->flags & PM_TRANS_FLAG_FRESHEN) {
if(dummy == NULL || rpmvercmp(dummy->version, info->version) >= 0) { if(dummy == NULL || rpmvercmp(dummy->version, info->version) >= 0) {
pm_errno = PM_ERR_PKG_CANT_FRESH; pm_errno = PM_ERR_PKG_CANT_FRESH;
@ -127,13 +128,12 @@ int add_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
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_WRONG_ARGS, -1)); ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
/* ORE ???
No need to check deps if pacman_add was called during a sync:
it is already done in pacman_sync */
/* Check dependencies /* Check dependencies
*/ */
/* ORE ???
No need to check deps if pacman_add was called during a sync:
it is already done in pacman_sync */
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
PMList *j; PMList *j;
@ -242,12 +242,14 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
(readfunc_t)gzread, (readfunc_t)gzread,
(writefunc_t)gzwrite (writefunc_t)gzwrite
}; };
unsigned short pmo_upgrade = (trans->type == PM_TRANS_TYPE_UPGRADE) ? 1 : 0; unsigned short pmo_upgrade;
char pm_install[PATH_MAX]; char pm_install[PATH_MAX];
pmpkg_t *oldpkg = NULL; pmpkg_t *oldpkg = NULL;
info = (pmpkg_t *)targ->data; info = (pmpkg_t *)targ->data;
errors = 0; errors = 0;
pmo_upgrade = (trans->type == PM_TRANS_TYPE_UPGRADE) ? 1 : 0;
/* see if this is an upgrade. if so, remove the old package first */ /* see if this is an upgrade. if so, remove the old package first */
if(pmo_upgrade) { if(pmo_upgrade) {
if(pkg_isin(info, db_get_pkgcache(db))) { if(pkg_isin(info, db_get_pkgcache(db))) {
@ -280,6 +282,9 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
FREETRANS(tr); FREETRANS(tr);
RET_ERR(PM_ERR_TRANS_ABORT, -1); RET_ERR(PM_ERR_TRANS_ABORT, -1);
} }
/* copy over the install reason */
/* ORE?
info->reason = oldpkg->reason; */
if(remove_loadtarget(db, tr, info->name) == -1) { if(remove_loadtarget(db, tr, info->name) == -1) {
FREETRANS(tr); FREETRANS(tr);
RET_ERR(PM_ERR_TRANS_ABORT, -1); RET_ERR(PM_ERR_TRANS_ABORT, -1);
@ -364,7 +369,9 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
pmpkg_t *depinfo = NULL; pmpkg_t *depinfo = NULL;
pmdepend_t depend; pmdepend_t depend;
splitdep(lp->data, &depend); if(splitdep(lp->data, &depend)) {
continue;
}
/* ORE /* ORE
same thing here: we should browse the cache instead of using db_scan */ same thing here: we should browse the cache instead of using db_scan */
depinfo = db_scan(db, depend.name, INFRQ_DESC|INFRQ_DEPENDS); depinfo = db_scan(db, depend.name, INFRQ_DESC|INFRQ_DEPENDS);
@ -436,7 +443,7 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
if(!pmo_upgrade || oldpkg == NULL) { if(!pmo_upgrade || oldpkg == NULL) {
nb = pm_list_is_strin(pathname, info->backup) ? 1 : 0; nb = pm_list_is_strin(pathname, info->backup) ? 1 : 0;
} else { } else {
/* op == PM_UPGRADE */ /* op == PM_TRANS_TYPE_UPGRADE */
if((md5_orig = _alpm_needbackup(pathname, oldpkg->backup)) != 0) { if((md5_orig = _alpm_needbackup(pathname, oldpkg->backup)) != 0) {
nb = 1; nb = 1;
} }
@ -450,7 +457,7 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
md5_local = MDFile(expath); md5_local = MDFile(expath);
/* extract the package's version to a temporary file and md5 it */ /* extract the package's version to a temporary file and md5 it */
temp = strdup("/tmp/pacman_XXXXXX"); temp = strdup("/tmp/alpm_XXXXXX");
mkstemp(temp); mkstemp(temp);
if(tar_extract_file(tar, temp)) { if(tar_extract_file(tar, temp)) {
alpm_logaction("could not extract %s: %s", pathname, strerror(errno)); alpm_logaction("could not extract %s: %s", pathname, strerror(errno));
@ -536,7 +543,7 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
} }
if(installnew) { if(installnew) {
/*_alpm_log(PM_LOG_FLOW2, " %s", expath);*/ /*_alpm_log(PM_LOG_FLOW2, " %s", expath);*/
if(_alpm_copyfile(temp, expath)) { if(_alpm_copyfile(temp, expath)) {
_alpm_log(PM_LOG_ERROR, "could not copy %s to %s: %s", temp, pathname, strerror(errno)); _alpm_log(PM_LOG_ERROR, "could not copy %s to %s: %s", temp, pathname, strerror(errno));
errors++; errors++;