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

Remove transaction type

Browse Source 
This basically started with this change :

 /* Transaction */
 struct __pmtrans_t {
-       pmtranstype_t type;
        pmtransflag_t flags;
        pmtransstate_t state;
-       alpm_list_t *packages;      /* list of (pmpkg_t *) */
+       alpm_list_t *add;      /* list of (pmpkg_t *) */
+       alpm_list_t *remove;      /* list of (pmpkg_t *) */

And then I have to modify all the code accordingly.
This commit is contained in:
Xavier Chantry 2009-07-15 19:14:01 +02:00 committed by Dan McGee
parent 0da96abc90
commit 8ff3b87066
15 changed files with 358 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
lib/libalpm/add.c
View File

@ -72,7 +72,7 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
/* check if an older version of said package is already in transaction /* check if an older version of said package is already in transaction
* packages. if so, replace it in the list */ * packages. if so, replace it in the list */
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
pmpkg_t *transpkg = i->data; pmpkg_t *transpkg = i->data;
if(strcmp(transpkg->name, pkgname) == 0) { if(strcmp(transpkg->name, pkgname) == 0) {
if(alpm_pkg_vercmp(transpkg->version, pkgver) < 0) { if(alpm_pkg_vercmp(transpkg->version, pkgver) < 0) {
@ -90,7 +90,7 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
} }
/* add the package to the transaction */ /* add the package to the transaction */
trans->packages = alpm_list_add(trans->packages, pkg); trans->add = alpm_list_add(trans->add, pkg);
return(0); return(0);
@ -99,91 +99,6 @@ error:
return(-1); return(-1);
} }
static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pmdb_t *db) {
/* this is kinda odd. If the old package exists, at this point we make a
* NEW transaction, unrelated to handle->trans, and instantiate a "remove"
* with the type PM_TRANS_TYPE_REMOVEUPGRADE. TODO: kill this weird
* behavior. */
pmtrans_t *tr = _alpm_trans_new();
ALPM_LOG_FUNC;
_alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n",
oldpkg->name, oldpkg->version);
if(!tr) {
RET_ERR(PM_ERR_TRANS_ABORT, -1);
}
if(_alpm_trans_init(tr, PM_TRANS_TYPE_REMOVEUPGRADE, trans->flags,
NULL, NULL, NULL) == -1) {
_alpm_trans_free(tr);
tr = NULL;
RET_ERR(PM_ERR_TRANS_ABORT, -1);
}
if(_alpm_remove_loadtarget(tr, db, newpkg->name) == -1) {
_alpm_trans_free(tr);
tr = NULL;
RET_ERR(PM_ERR_TRANS_ABORT, -1);
}
/* copy the remove skiplist over */
tr->skip_remove = alpm_list_strdup(trans->skip_remove);
const alpm_list_t *b;
/* Add files in the NEW backup array to the NoUpgrade array
* so this removal operation doesn't kill them */
alpm_list_t *old_noupgrade = alpm_list_strdup(handle->noupgrade);
/* old package backup list */
alpm_list_t *filelist = alpm_pkg_get_files(newpkg);
for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) {
char *backup = _alpm_backup_file(b->data);
/* safety check (fix the upgrade026 pactest) */
if(!alpm_list_find_str(filelist, backup)) {
FREE(backup);
continue;
}
_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
backup);
handle->noupgrade = alpm_list_add(handle->noupgrade,
backup);
}
/* TODO: we could also add files in the OLD backup array, but this would
* change the backup handling behavior, and break several pactests, and we
* can't do this just before 3.1 release.
* The unlink_file function in remove.c would also need to be reviewed. */
#if 0
/* new package backup list */
for(b = alpm_pkg_get_backup(oldpkg); b; b = b->next) {
char *backup = _alpm_backup_file(b->data);
/* make sure we don't add duplicate entries */
if(!alpm_list_find_ptr(handle->noupgrade, backup)) {
_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
backup);
handle->noupgrade = alpm_list_add(handle->noupgrade,
backup);
}
}
#endif
int ret = _alpm_remove_commit(tr, db);
_alpm_trans_free(tr);
tr = NULL;
/* restore our "NoUpgrade" list to previous state */
FREELIST(handle->noupgrade);
handle->noupgrade = old_noupgrade;
if(ret == -1) {
RET_ERR(PM_ERR_TRANS_ABORT, -1);
}
return(0);
}
static int extract_single_file(struct archive *archive, static int extract_single_file(struct archive *archive,
struct archive_entry *entry, pmpkg_t *newpkg, pmpkg_t *oldpkg, struct archive_entry *entry, pmpkg_t *newpkg, pmpkg_t *oldpkg,
pmtrans_t *trans, pmdb_t *db) pmtrans_t *trans, pmdb_t *db)
@ -606,8 +521,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
if(oldpkg) { if(oldpkg) {
/* set up fake remove transaction */ /* set up fake remove transaction */
int ret = upgrade_remove(oldpkg, newpkg, trans, db); if(_alpm_upgraderemove_package(oldpkg, newpkg, trans) == -1) {
if(ret != 0) { pm_errno = PM_ERR_TRANS_ABORT;
ret = -1;
goto cleanup; goto cleanup;
} }
} }
@ -783,15 +699,15 @@ int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db)
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
if(trans->packages == NULL) { if(trans->add == NULL) {
return(0); return(0);
} }
pkg_count = alpm_list_count(trans->packages); pkg_count = alpm_list_count(trans->add);
pkg_current = 1; pkg_current = 1;
/* loop through our package list adding/upgrading one at a time */ /* loop through our package list adding/upgrading one at a time */
for(targ = trans->packages; targ; targ = targ->next) { for(targ = trans->add; targ; targ = targ->next) {
if(handle->trans->state == STATE_INTERRUPTED) { if(handle->trans->state == STATE_INTERRUPTED) {
return(0); return(0);
} }

18
lib/libalpm/alpm.h
View File

@ -225,7 +225,6 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg);
alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg);
alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg);
alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg);
alpm_list_t *alpm_pkg_get_removes(pmpkg_t *pkg);
pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg); pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg);
void *alpm_pkg_changelog_open(pmpkg_t *pkg); void *alpm_pkg_changelog_open(pmpkg_t *pkg);
size_t alpm_pkg_changelog_read(void *ptr, size_t size, size_t alpm_pkg_changelog_read(void *ptr, size_t size,
@ -263,13 +262,6 @@ pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync);
* Transactions * Transactions
*/ */
/* Types */
typedef enum _pmtranstype_t {
PM_TRANS_TYPE_UPGRADE = 1,
PM_TRANS_TYPE_REMOVE,
PM_TRANS_TYPE_REMOVEUPGRADE,
PM_TRANS_TYPE_SYNC
} pmtranstype_t;
/* Flags */ /* Flags */
typedef enum _pmtransflag_t { typedef enum _pmtransflag_t {
@ -403,14 +395,16 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *,
/* Transaction Progress callback */ /* Transaction Progress callback */
typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, int, int); typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, int, int);
pmtranstype_t alpm_trans_get_type();
unsigned int alpm_trans_get_flags(); unsigned int alpm_trans_get_flags();
alpm_list_t * alpm_trans_get_pkgs(); alpm_list_t * alpm_trans_get_add();
int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, alpm_list_t * alpm_trans_get_remove();
int alpm_trans_init(pmtransflag_t flags,
alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv,
alpm_trans_cb_progress cb_progress); alpm_trans_cb_progress cb_progress);
int alpm_trans_sysupgrade(int enable_downgrade); int alpm_trans_sysupgrade(int enable_downgrade);
int alpm_trans_addtarget(char *target); int alpm_trans_sync(char *target);
int alpm_trans_add(char *target);
int alpm_trans_remove(char *target);
int alpm_trans_prepare(alpm_list_t **data); int alpm_trans_prepare(alpm_list_t **data);
int alpm_trans_commit(alpm_list_t **data); int alpm_trans_commit(alpm_list_t **data);
int alpm_trans_interrupt(void); int alpm_trans_interrupt(void);

3
lib/libalpm/be_files.c
View File

@ -148,7 +148,7 @@ static int checkdbdir(pmdb_t *db)
* pmdb_t *db; * pmdb_t *db;
* int result; * int result;
* db = alpm_list_getdata(alpm_option_get_syncdbs()); * db = alpm_list_getdata(alpm_option_get_syncdbs());
* if(alpm_trans_init(PM_TRANS_TYPE_SYNC, 0, NULL, NULL, NULL) == 0) { * if(alpm_trans_init(0, NULL, NULL, NULL) == 0) {
* result = alpm_db_update(0, db); * result = alpm_db_update(0, db);
* alpm_trans_release(); * alpm_trans_release();
* *
@ -191,7 +191,6 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
*/ */
ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
ASSERT(handle->trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1));
if(!alpm_list_find_ptr(handle->dbs_sync, db)) { if(!alpm_list_find_ptr(handle->dbs_sync, db)) {
RET_ERR(PM_ERR_DB_NOT_FOUND, -1); RET_ERR(PM_ERR_DB_NOT_FOUND, -1);

2
lib/libalpm/conflict.c
View File

@ -516,7 +516,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
/* skip removal of file, but not add. this will prevent a second /* skip removal of file, but not add. this will prevent a second
* package from removing the file when it was already installed * package from removing the file when it was already installed
* by its new owner (whether the file is in backup array or not */ * by its new owner (whether the file is in backup array or not */
trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path)); trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(filestr));
_alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr); _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr);
resolved_conflict = 1; resolved_conflict = 1;
} }

7
lib/libalpm/package.c
View File

@ -423,13 +423,6 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg)
return pkg->backup; return pkg->backup;
} }
alpm_list_t SYMEXPORT *alpm_pkg_get_removes(pmpkg_t *pkg)
{
ASSERT(pkg != NULL, return(NULL));
return(pkg->removes);
}
pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg) pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg)
{ {
/* Sanity checks */ /* Sanity checks */

174
lib/libalpm/remove.c
View File

@ -65,7 +65,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
targ = name; targ = name;
} }
if(_alpm_pkg_find(trans->packages, targ)) { if(_alpm_pkg_find(trans->remove, targ)) {
RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
} }
@ -75,7 +75,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
} }
_alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name); _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name);
trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info));
return(0); return(0);
} }
@ -91,10 +91,10 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
pmdepmissing_t *miss = (pmdepmissing_t *)i->data; pmdepmissing_t *miss = (pmdepmissing_t *)i->data;
pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target); pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target);
if(info) { if(info) {
if(!_alpm_pkg_find(trans->packages, alpm_pkg_get_name(info))) { if(!_alpm_pkg_find(trans->remove, alpm_pkg_get_name(info))) {
_alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n",
alpm_pkg_get_name(info)); alpm_pkg_get_name(info));
trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info));
} }
} else { } else {
_alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"), _alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"),
@ -103,7 +103,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
} }
alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free);
alpm_list_free(lp); alpm_list_free(lp);
lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL); lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->remove, NULL);
} }
} }
@ -118,11 +118,11 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
for(i = lp; i; i = i->next) { for(i = lp; i; i = i->next) {
pmdepmissing_t *miss = (pmdepmissing_t *)i->data; pmdepmissing_t *miss = (pmdepmissing_t *)i->data;
void *vpkg; void *vpkg;
pmpkg_t *pkg = _alpm_pkg_find(trans->packages, miss->causingpkg); pmpkg_t *pkg = _alpm_pkg_find(trans->remove, miss->causingpkg);
if(pkg == NULL) { if(pkg == NULL) {
continue; continue;
} }
trans->packages = alpm_list_remove(trans->packages, pkg, _alpm_pkg_cmp, trans->remove = alpm_list_remove(trans->remove, pkg, _alpm_pkg_cmp,
&vpkg); &vpkg);
pkg = vpkg; pkg = vpkg;
if(pkg) { if(pkg) {
@ -133,7 +133,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
} }
alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free);
alpm_list_free(lp); alpm_list_free(lp);
lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL); lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->remove, NULL);
} }
} }
@ -146,21 +146,16 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **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));
/* skip all checks if we are doing this removal as part of an upgrade */
if(trans->type == PM_TRANS_TYPE_REMOVEUPGRADE) {
return(0);
}
if((trans->flags & PM_TRANS_FLAG_RECURSE) && !(trans->flags & PM_TRANS_FLAG_CASCADE)) { if((trans->flags & PM_TRANS_FLAG_RECURSE) && !(trans->flags & PM_TRANS_FLAG_CASCADE)) {
_alpm_log(PM_LOG_DEBUG, "finding removable dependencies\n"); _alpm_log(PM_LOG_DEBUG, "finding removable dependencies\n");
_alpm_recursedeps(db, trans->packages, trans->flags & PM_TRANS_FLAG_RECURSEALL); _alpm_recursedeps(db, trans->remove, trans->flags & PM_TRANS_FLAG_RECURSEALL);
} }
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL); EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n"); _alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL); lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->remove, NULL);
if(lp != NULL) { if(lp != NULL) {
if(trans->flags & PM_TRANS_FLAG_CASCADE) { if(trans->flags & PM_TRANS_FLAG_CASCADE) {
@ -183,15 +178,15 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
/* re-order w.r.t. dependencies */ /* re-order w.r.t. dependencies */
_alpm_log(PM_LOG_DEBUG, "sorting by dependencies\n"); _alpm_log(PM_LOG_DEBUG, "sorting by dependencies\n");
lp = _alpm_sortbydeps(trans->packages, 1); lp = _alpm_sortbydeps(trans->remove, 1);
/* free the old alltargs */ /* free the old alltargs */
alpm_list_free(trans->packages); alpm_list_free(trans->remove);
trans->packages = lp; trans->remove = lp;
/* -Rcs == -Rc then -Rs */ /* -Rcs == -Rc then -Rs */
if((trans->flags & PM_TRANS_FLAG_CASCADE) && (trans->flags & PM_TRANS_FLAG_RECURSE)) { if((trans->flags & PM_TRANS_FLAG_CASCADE) && (trans->flags & PM_TRANS_FLAG_RECURSE)) {
_alpm_log(PM_LOG_DEBUG, "finding removable dependencies\n"); _alpm_log(PM_LOG_DEBUG, "finding removable dependencies\n");
_alpm_recursedeps(db, trans->packages, trans->flags & PM_TRANS_FLAG_RECURSEALL); _alpm_recursedeps(db, trans->remove, trans->flags & PM_TRANS_FLAG_RECURSEALL);
} }
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
@ -201,13 +196,13 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
return(0); return(0);
} }
static int can_remove_file(pmtrans_t *trans, const char *path) static int can_remove_file(const char *path, alpm_list_t *skip)
{ {
char file[PATH_MAX+1]; char file[PATH_MAX+1];
snprintf(file, PATH_MAX, "%s%s", handle->root, path); snprintf(file, PATH_MAX, "%s%s", handle->root, path);
if(alpm_list_find_str(trans->skip_remove, file)) { if(alpm_list_find_str(skip, file)) {
/* return success because we will never actually remove this file */ /* return success because we will never actually remove this file */
return(1); return(1);
} }
@ -228,7 +223,7 @@ static int can_remove_file(pmtrans_t *trans, const char *path)
/* Helper function for iterating through a package's file and deleting them /* Helper function for iterating through a package's file and deleting them
* Used by _alpm_remove_commit. */ * Used by _alpm_remove_commit. */
static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans) static void unlink_file(pmpkg_t *info, char *filename, alpm_list_t *skip_remove, int nosave)
{ {
struct stat buf; struct stat buf;
char file[PATH_MAX+1]; char file[PATH_MAX+1];
@ -237,13 +232,13 @@ static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans)
snprintf(file, PATH_MAX, "%s%s", handle->root, filename); snprintf(file, PATH_MAX, "%s%s", handle->root, filename);
if(trans->type == PM_TRANS_TYPE_REMOVEUPGRADE) { /* check the remove skip list before removing the file.
/* check noupgrade */ * see the big comment block in db_find_fileconflicts() for an
if(alpm_list_find_str(handle->noupgrade, filename)) { * explanation. */
_alpm_log(PM_LOG_DEBUG, "Skipping removal of '%s' due to NoUpgrade\n", if(alpm_list_find_str(skip_remove, filename)) {
file); _alpm_log(PM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n",
return; file);
} return;
} }
/* we want to do a lstat here, and not a _alpm_lstat. /* we want to do a lstat here, and not a _alpm_lstat.
@ -263,19 +258,10 @@ static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans)
_alpm_log(PM_LOG_DEBUG, "removing directory %s\n", file); _alpm_log(PM_LOG_DEBUG, "removing directory %s\n", file);
} }
} else { } else {
/* check the remove skip list before removing the file.
* see the big comment block in db_find_fileconflicts() for an
* explanation. */
if(alpm_list_find_str(trans->skip_remove, file)) {
_alpm_log(PM_LOG_DEBUG, "%s is in trans->skip_remove, skipping removal\n",
file);
return;
}
/* if the file needs backup and has been modified, back it up to .pacsave */ /* if the file needs backup and has been modified, back it up to .pacsave */
char *pkghash = _alpm_needbackup(filename, alpm_pkg_get_backup(info)); char *pkghash = _alpm_needbackup(filename, alpm_pkg_get_backup(info));
if(pkghash) { if(pkghash) {
if(trans->flags & PM_TRANS_FLAG_NOSAVE) { if(nosave) {
_alpm_log(PM_LOG_DEBUG, "transaction is set to NOSAVE, not backing up '%s'\n", file); _alpm_log(PM_LOG_DEBUG, "transaction is set to NOSAVE, not backing up '%s'\n", file);
FREE(pkghash); FREE(pkghash);
} else { } else {
@ -303,7 +289,69 @@ static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans)
} }
} }
int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans)
{
alpm_list_t *skip_remove, *b;
alpm_list_t *newfiles, *lp;
alpm_list_t *files = alpm_pkg_get_files(oldpkg);
const char *pkgname = alpm_pkg_get_name(oldpkg);
ALPM_LOG_FUNC;
_alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n",
oldpkg->name, oldpkg->version);
/* copy the remove skiplist over */
skip_remove =
alpm_list_join(alpm_list_strdup(trans->skip_remove),alpm_list_strdup(handle->noupgrade));
/* Add files in the NEW backup array to the skip_remove array
* so this removal operation doesn't kill them */
/* old package backup list */
alpm_list_t *filelist = alpm_pkg_get_files(newpkg);
for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) {
char *backup = _alpm_backup_file(b->data);
/* safety check (fix the upgrade026 pactest) */
if(!alpm_list_find_str(filelist, backup)) {
FREE(backup);
continue;
}
_alpm_log(PM_LOG_DEBUG, "adding %s to the skip_remove array\n", backup);
skip_remove = alpm_list_add(skip_remove, backup);
}
for(lp = files; lp; lp = lp->next) {
if(!can_remove_file(lp->data, skip_remove)) {
_alpm_log(PM_LOG_DEBUG, "not removing package '%s', can't remove all files\n",
pkgname);
RET_ERR(PM_ERR_PKG_CANT_REMOVE, -1);
}
}
/* iterate through the list backwards, unlinking files */
newfiles = alpm_list_reverse(files);
for(lp = newfiles; lp; lp = alpm_list_next(lp)) {
unlink_file(oldpkg, lp->data, skip_remove, 0);
}
alpm_list_free(newfiles);
FREELIST(skip_remove);
/* remove the package from the database */
_alpm_log(PM_LOG_DEBUG, "updating database\n");
_alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname);
if(_alpm_db_remove(handle->db_local, oldpkg) == -1) {
_alpm_log(PM_LOG_ERROR, _("could not remove database entry %s-%s\n"),
pkgname, alpm_pkg_get_version(oldpkg));
}
/* remove the package from the cache */
if(_alpm_db_remove_pkgfromcache(handle->db_local, oldpkg) == -1) {
_alpm_log(PM_LOG_ERROR, _("could not remove entry '%s' from cache\n"),
pkgname);
}
return(0);
}
int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
{ {
pmpkg_t *info; pmpkg_t *info;
alpm_list_t *targ, *lp; alpm_list_t *targ, *lp;
@ -314,12 +362,11 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
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));
pkg_count = alpm_list_count(trans->packages); pkg_count = alpm_list_count(trans->remove);
for(targ = trans->packages; targ; targ = targ->next) { for(targ = trans->remove; targ; targ = targ->next) {
int position = 0; int position = 0;
char scriptlet[PATH_MAX]; char scriptlet[PATH_MAX];
alpm_list_t *files;
info = (pmpkg_t*)targ->data; info = (pmpkg_t*)targ->data;
const char *pkgname = NULL; const char *pkgname = NULL;
@ -332,23 +379,21 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
pkgname, alpm_pkg_get_version(info)); pkgname, alpm_pkg_get_version(info));
if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL);
EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL); _alpm_log(PM_LOG_DEBUG, "removing package %s-%s\n",
_alpm_log(PM_LOG_DEBUG, "removing package %s-%s\n", pkgname, alpm_pkg_get_version(info));
pkgname, alpm_pkg_get_version(info));
/* run the pre-remove scriptlet if it exists */ /* run the pre-remove scriptlet if it exists */
if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
_alpm_runscriptlet(handle->root, scriptlet, "pre_remove", _alpm_runscriptlet(handle->root, scriptlet, "pre_remove",
alpm_pkg_get_version(info), NULL, trans); alpm_pkg_get_version(info), NULL, trans);
}
} }
files = alpm_pkg_get_files(info);
if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) {
alpm_list_t *files = alpm_pkg_get_files(info);
for(lp = files; lp; lp = lp->next) { for(lp = files; lp; lp = lp->next) {
if(!can_remove_file(trans, lp->data)) { if(!can_remove_file(lp->data, NULL)) {
_alpm_log(PM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", _alpm_log(PM_LOG_DEBUG, "not removing package '%s', can't remove all files\n",
pkgname); pkgname);
RET_ERR(PM_ERR_PKG_CANT_REMOVE, -1); RET_ERR(PM_ERR_PKG_CANT_REMOVE, -1);
@ -363,7 +408,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
/* iterate through the list backwards, unlinking files */ /* iterate through the list backwards, unlinking files */
newfiles = alpm_list_reverse(files); newfiles = alpm_list_reverse(files);
for(lp = newfiles; lp; lp = alpm_list_next(lp)) { for(lp = newfiles; lp; lp = alpm_list_next(lp)) {
unlink_file(info, lp->data, trans); unlink_file(info, lp->data, NULL, trans->flags & PM_TRANS_FLAG_NOSAVE);
/* update progress bar after each file */ /* update progress bar after each file */
percent = (double)position / (double)filenum; percent = (double)position / (double)filenum;
@ -379,12 +424,10 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100,
pkg_count, (pkg_count - alpm_list_count(targ) + 1)); pkg_count, (pkg_count - alpm_list_count(targ) + 1));
if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) { /* run the post-remove script if it exists */
/* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { _alpm_runscriptlet(handle->root, scriptlet, "post_remove",
_alpm_runscriptlet(handle->root, scriptlet, "post_remove", alpm_pkg_get_version(info), NULL, trans);
alpm_pkg_get_version(info), NULL, trans);
}
} }
/* remove the package from the database */ /* remove the package from the database */
@ -400,16 +443,11 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
pkgname); pkgname);
} }
/* call a done event if this isn't an upgrade */ EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL);
if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) {
EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL);
}
} }
/* run ldconfig if it exists */ /* run ldconfig if it exists */
if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) { _alpm_ldconfig(handle->root);
_alpm_ldconfig(handle->root);
}
return(0); return(0);
} }

5
lib/libalpm/remove.h
View File

@ -26,7 +26,10 @@
int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name); int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name);
int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data); int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data);
int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db); int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db);
int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans);
#endif /* _ALPM_REMOVE_H */ #endif /* _ALPM_REMOVE_H */

100
lib/libalpm/sync.c
View File

@ -49,6 +49,7 @@
#include "alpm.h" #include "alpm.h"
#include "dload.h" #include "dload.h"
#include "delta.h" #include "delta.h"
#include "remove.h"
/** Check for new version of pkg in sync repos /** Check for new version of pkg in sync repos
* (only the first occurrence is considered in sync) * (only the first occurrence is considered in sync)
@ -91,7 +92,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) {
pmpkg_t *lpkg = i->data; pmpkg_t *lpkg = i->data;
if(_alpm_pkg_find(trans->packages, lpkg->name)) { if(_alpm_pkg_find(trans->add, lpkg->name)) {
_alpm_log(PM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name); _alpm_log(PM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name);
continue; continue;
} }
@ -114,7 +115,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
} else { } else {
_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
spkg->name, spkg->version); spkg->name, spkg->version);
trans->packages = alpm_list_add(trans->packages, spkg); trans->add = alpm_list_add(trans->add, spkg);
} }
} else if(cmp < 0) { } else if(cmp < 0) {
if(enable_downgrade) { if(enable_downgrade) {
@ -125,7 +126,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
} else { } else {
_alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"), _alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"),
lpkg->name, lpkg->version, spkg->version); lpkg->name, lpkg->version, spkg->version);
trans->packages = alpm_list_add(trans->packages, spkg); trans->add = alpm_list_add(trans->add, spkg);
} }
} else { } else {
_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
@ -153,7 +154,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
} }
/* If spkg is already in the target list, we append lpkg to spkg's removes list */ /* If spkg is already in the target list, we append lpkg to spkg's removes list */
pmpkg_t *tpkg = _alpm_pkg_find(trans->packages, spkg->name); pmpkg_t *tpkg = _alpm_pkg_find(trans->add, spkg->name);
if(tpkg) { if(tpkg) {
/* sanity check, multiple repos can contain spkg->name */ /* sanity check, multiple repos can contain spkg->name */
if(tpkg->origin_data.db != sdb) { if(tpkg->origin_data.db != sdb) {
@ -174,7 +175,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
spkg->removes = alpm_list_add(NULL, lpkg); spkg->removes = alpm_list_add(NULL, lpkg);
_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
spkg->name, spkg->version); spkg->name, spkg->version);
trans->packages = alpm_list_add(trans->packages, spkg); trans->add = alpm_list_add(trans->add, spkg);
} }
} }
} }
@ -238,7 +239,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
return(-1); return(-1);
} }
if(_alpm_pkg_find(trans->packages, alpm_pkg_get_name(spkg))) { if(_alpm_pkg_find(trans->add, alpm_pkg_get_name(spkg))) {
RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
} }
@ -268,7 +269,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
spkg->reason = PM_PKG_REASON_EXPLICIT; spkg->reason = PM_PKG_REASON_EXPLICIT;
_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
trans->packages = alpm_list_add(trans->packages, spkg); trans->add = alpm_list_add(trans->add, spkg);
return(0); return(0);
} }
@ -329,8 +330,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
alpm_list_t *deps = NULL; alpm_list_t *deps = NULL;
alpm_list_t *preferred = NULL; alpm_list_t *preferred = NULL;
alpm_list_t *unresolvable = NULL; alpm_list_t *unresolvable = NULL;
alpm_list_t *remove = NULL; /* allow checkdeps usage with trans->packages */
alpm_list_t *i, *j; alpm_list_t *i, *j;
alpm_list_t *remove = NULL;
int ret = 0; int ret = 0;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
@ -351,7 +352,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
_alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n"); _alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n");
/* build remove list and preferred list for resolvedeps */ /* build remove list and preferred list for resolvedeps */
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
for(j = spkg->removes; j; j = j->next) { for(j = spkg->removes; j; j = j->next) {
remove = alpm_list_add(remove, j->data); remove = alpm_list_add(remove, j->data);
@ -361,7 +362,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
/* Resolve packages in the transaction one at a time, in addtion /* Resolve packages in the transaction one at a time, in addtion
building up a list of packages which could not be resolved. */ building up a list of packages which could not be resolved. */
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
pmpkg_t *pkg = i->data; pmpkg_t *pkg = i->data;
if(_alpm_resolvedeps(db_local, dbs_sync, pkg, preferred, if(_alpm_resolvedeps(db_local, dbs_sync, pkg, preferred,
&resolved, remove, data) == -1) { &resolved, remove, data) == -1) {
@ -401,7 +402,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
/* Set DEPEND reason for pulled packages */ /* Set DEPEND reason for pulled packages */
for(i = resolved; i; i = i->next) { for(i = resolved; i; i = i->next) {
pmpkg_t *pkg = i->data; pmpkg_t *pkg = i->data;
if(!_alpm_pkg_find(trans->packages, pkg->name)) { if(!_alpm_pkg_find(trans->add, pkg->name)) {
pkg->reason = PM_PKG_REASON_DEPEND; pkg->reason = PM_PKG_REASON_DEPEND;
} }
} }
@ -411,8 +412,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
alpm_list_free_inner(unresolvable, (alpm_list_fn_free)_alpm_pkg_free_trans); alpm_list_free_inner(unresolvable, (alpm_list_fn_free)_alpm_pkg_free_trans);
/* re-order w.r.t. dependencies */ /* re-order w.r.t. dependencies */
alpm_list_free(trans->packages); alpm_list_free(trans->add);
trans->packages = _alpm_sortbydeps(resolved, 0); trans->add = _alpm_sortbydeps(resolved, 0);
alpm_list_free(resolved); alpm_list_free(resolved);
EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL); EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
@ -426,15 +427,15 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
/* 1. check for conflicts in the target list */ /* 1. check for conflicts in the target list */
_alpm_log(PM_LOG_DEBUG, "check targets vs targets\n"); _alpm_log(PM_LOG_DEBUG, "check targets vs targets\n");
deps = _alpm_innerconflicts(trans->packages); deps = _alpm_innerconflicts(trans->add);
for(i = deps; i; i = i->next) { for(i = deps; i; i = i->next) {
pmconflict_t *conflict = i->data; pmconflict_t *conflict = i->data;
pmpkg_t *rsync, *sync, *sync1, *sync2; pmpkg_t *rsync, *sync, *sync1, *sync2;
/* have we already removed one of the conflicting targets? */ /* have we already removed one of the conflicting targets? */
sync1 = _alpm_pkg_find(trans->packages, conflict->package1); sync1 = _alpm_pkg_find(trans->add, conflict->package1);
sync2 = _alpm_pkg_find(trans->packages, conflict->package2); sync2 = _alpm_pkg_find(trans->add, conflict->package2);
if(!sync1 || !sync2) { if(!sync1 || !sync2) {
continue; continue;
} }
@ -474,7 +475,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
_alpm_log(PM_LOG_WARNING, _alpm_log(PM_LOG_WARNING,
_("removing '%s' from target list because it conflicts with '%s'\n"), _("removing '%s' from target list because it conflicts with '%s'\n"),
rsync->name, sync->name); rsync->name, sync->name);
trans->packages = alpm_list_remove(trans->packages, rsync, _alpm_pkg_cmp, NULL); trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL);
_alpm_pkg_free_trans(rsync); /* rsync is not transaction target anymore */ _alpm_pkg_free_trans(rsync); /* rsync is not transaction target anymore */
continue; continue;
} }
@ -485,7 +486,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
/* 2. we check for target vs db conflicts (and resolve)*/ /* 2. we check for target vs db conflicts (and resolve)*/
_alpm_log(PM_LOG_DEBUG, "check targets vs db and db vs targets\n"); _alpm_log(PM_LOG_DEBUG, "check targets vs db and db vs targets\n");
deps = _alpm_outerconflicts(db_local, trans->packages); deps = _alpm_outerconflicts(db_local, trans->add);
for(i = deps; i; i = i->next) { for(i = deps; i; i = i->next) {
pmconflict_t *conflict = i->data; pmconflict_t *conflict = i->data;
@ -493,7 +494,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
/* if conflict->package2 (the local package) is not elected for removal, /* if conflict->package2 (the local package) is not elected for removal,
we ask the user */ we ask the user */
int found = 0; int found = 0;
for(j = trans->packages; j && !found; j = j->next) { for(j = trans->add; j && !found; j = j->next) {
pmpkg_t *spkg = j->data; pmpkg_t *spkg = j->data;
if(_alpm_pkg_find(spkg->removes, conflict->package2)) { if(_alpm_pkg_find(spkg->removes, conflict->package2)) {
found = 1; found = 1;
@ -506,7 +507,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
_alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", _alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
conflict->package1, conflict->package2); conflict->package1, conflict->package2);
pmpkg_t *sync = _alpm_pkg_find(trans->packages, conflict->package1); pmpkg_t *sync = _alpm_pkg_find(trans->add, conflict->package1);
pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2);
int doremove = 0; int doremove = 0;
QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1, QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1,
@ -538,16 +539,16 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
/* rebuild remove list */ /* rebuild remove list */
alpm_list_free(remove); alpm_list_free(remove);
remove = NULL; trans->remove = NULL;
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
for(j = spkg->removes; j; j = j->next) { for(j = spkg->removes; j; j = j->next) {
remove = alpm_list_add(remove, j->data); trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(j->data));
} }
} }
_alpm_log(PM_LOG_DEBUG, "checking dependencies\n"); _alpm_log(PM_LOG_DEBUG, "checking dependencies\n");
deps = alpm_checkdeps(_alpm_db_get_pkgcache(db_local), 1, remove, trans->packages); deps = alpm_checkdeps(_alpm_db_get_pkgcache(db_local), 1, trans->remove, trans->add);
if(deps) { if(deps) {
pm_errno = PM_ERR_UNSATISFIED_DEPS; pm_errno = PM_ERR_UNSATISFIED_DEPS;
ret = -1; ret = -1;
@ -560,7 +561,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
goto cleanup; goto cleanup;
} }
} }
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
/* update download size field */ /* update download size field */
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
if(compute_download_size(spkg) != 0) { if(compute_download_size(spkg) != 0) {
@ -570,7 +571,6 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
} }
cleanup: cleanup:
alpm_list_free(remove);
alpm_list_free(unresolvable); alpm_list_free(unresolvable);
return(ret); return(ret);
@ -607,7 +607,7 @@ static int apply_deltas(pmtrans_t *trans)
int ret = 0; int ret = 0;
const char *cachedir = _alpm_filecache_setup(); const char *cachedir = _alpm_filecache_setup();
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
alpm_list_t *delta_path = spkg->delta_path; alpm_list_t *delta_path = spkg->delta_path;
alpm_list_t *dlts = NULL; alpm_list_t *dlts = NULL;
@ -717,7 +717,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
{ {
alpm_list_t *i, *j, *files = NULL; alpm_list_t *i, *j, *files = NULL;
alpm_list_t *deltas = NULL; alpm_list_t *deltas = NULL;
pmtrans_t *tr_remove = NULL;
int replaces = 0; int replaces = 0;
int errors = 0; int errors = 0;
const char *cachedir = NULL; const char *cachedir = NULL;
@ -736,7 +735,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
if(handle->totaldlcb) { if(handle->totaldlcb) {
off_t total_size = (off_t)0; off_t total_size = (off_t)0;
/* sum up the download size for each package and store total */ /* sum up the download size for each package and store total */
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
total_size += spkg->download_size; total_size += spkg->download_size;
} }
@ -747,7 +746,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
for(i = handle->dbs_sync; i; i = i->next) { for(i = handle->dbs_sync; i; i = i->next) {
pmdb_t *current = i->data; pmdb_t *current = i->data;
for(j = trans->packages; j; j = j->next) { for(j = trans->add; j; j = j->next) {
pmpkg_t *spkg = j->data; pmpkg_t *spkg = j->data;
if(spkg->origin == PKG_FROM_CACHE && current == spkg->origin_data.db) { if(spkg->origin == PKG_FROM_CACHE && current == spkg->origin_data.db) {
@ -840,7 +839,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
EVENT(trans, PM_TRANS_EVT_INTEGRITY_START, NULL, NULL); EVENT(trans, PM_TRANS_EVT_INTEGRITY_START, NULL, NULL);
errors = 0; errors = 0;
for(i = trans->packages; i; i = i->next) { for(i = trans->add; i; i = i->next) {
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
if(spkg->origin == PKG_FROM_FILE) { if(spkg->origin == PKG_FROM_FILE) {
continue; /* pkg_load() has been already called, this package is valid */ continue; /* pkg_load() has been already called, this package is valid */
@ -868,7 +867,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
} }
FREE(filepath); FREE(filepath);
pkgfile->reason = spkg->reason; /* copy over install reason */ pkgfile->reason = spkg->reason; /* copy over install reason */
pkgfile->removes = alpm_list_copy(spkg->removes); /* copy over removes list */
i->data = pkgfile; i->data = pkgfile;
_alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */ _alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */
} }
@ -883,32 +881,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
trans->state = STATE_COMMITING; trans->state = STATE_COMMITING;
/* Create remove transaction */ replaces = alpm_list_count(trans->remove);
tr_remove = _alpm_trans_new();
if(tr_remove == NULL) {
_alpm_log(PM_LOG_ERROR, _("could not create removal transaction\n"));
goto error;
}
if(_alpm_trans_init(tr_remove, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS, NULL, NULL, NULL) == -1) {
_alpm_log(PM_LOG_ERROR, _("could not initialize the removal transaction\n"));
goto error;
}
/* adding targets to the remove transaction */
for(i = trans->packages; i; i = i->next) {
pmpkg_t *spkg = i->data;
alpm_list_t *j;
for(j = spkg->removes; j; j = j->next) {
pmpkg_t *pkg = j->data;
if(!_alpm_pkg_find(tr_remove->packages, pkg->name)) {
if(_alpm_trans_addtarget(tr_remove, pkg->name) == -1) {
goto error;
}
replaces++;
}
}
}
/* fileconflict check */ /* fileconflict check */
if(!(trans->flags & PM_TRANS_FLAG_FORCE)) { if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
@ -916,7 +889,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
_alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n"); _alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n");
alpm_list_t *conflict = _alpm_db_find_fileconflicts(db_local, trans, alpm_list_t *conflict = _alpm_db_find_fileconflicts(db_local, trans,
trans->packages, tr_remove->packages); trans->add, trans->remove);
if(conflict) { if(conflict) {
pm_errno = PM_ERR_FILE_CONFLICTS; pm_errno = PM_ERR_FILE_CONFLICTS;
if(data) { if(data) {
@ -934,14 +907,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
/* remove conflicting and to-be-replaced packages */ /* remove conflicting and to-be-replaced packages */
if(replaces) { if(replaces) {
_alpm_log(PM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n"); _alpm_log(PM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n");
if(_alpm_trans_prepare(tr_remove, data) == -1) {
_alpm_log(PM_LOG_ERROR, _("could not prepare removal transaction\n"));
goto error;
}
/* we want the frontend to be aware of commit details */ /* we want the frontend to be aware of commit details */
tr_remove->cb_event = trans->cb_event; if(_alpm_remove_packages(trans, handle->db_local) == -1) {
tr_remove->cb_progress = trans->cb_progress;
if(_alpm_trans_commit(tr_remove, NULL) == -1) {
_alpm_log(PM_LOG_ERROR, _("could not commit removal transaction\n")); _alpm_log(PM_LOG_ERROR, _("could not commit removal transaction\n"));
goto error; goto error;
} }
@ -958,7 +925,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
error: error:
FREELIST(files); FREELIST(files);
alpm_list_free(deltas); alpm_list_free(deltas);
_alpm_trans_free(tr_remove);
return(ret); return(ret);
} }

377
lib/libalpm/trans.c
View File

@ -52,17 +52,18 @@
*/ */
/** Initialize the transaction. /** Initialize the transaction.
* @param type type of the transaction
* @param flags flags of the transaction (like nodeps, etc) * @param flags flags of the transaction (like nodeps, etc)
* @param event event callback function pointer * @param event event callback function pointer
* @param conv question callback function pointer * @param conv question callback function pointer
* @param progress progress callback function pointer * @param progress progress callback function pointer
* @return 0 on success, -1 on error (pm_errno is set accordingly) * @return 0 on success, -1 on error (pm_errno is set accordingly)
*/ */
int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
alpm_trans_cb_event event, alpm_trans_cb_conv conv, alpm_trans_cb_event event, alpm_trans_cb_conv conv,
alpm_trans_cb_progress progress) alpm_trans_cb_progress progress)
{ {
pmtrans_t *trans;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
@ -78,12 +79,20 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags,
} }
} }
handle->trans = _alpm_trans_new(); trans = _alpm_trans_new();
if(handle->trans == NULL) { if(trans == NULL) {
RET_ERR(PM_ERR_MEMORY, -1); RET_ERR(PM_ERR_MEMORY, -1);
} }
return(_alpm_trans_init(handle->trans, type, flags, event, conv, progress)); trans->flags = flags;
trans->cb_event = event;
trans->cb_conv = conv;
trans->cb_progress = progress;
trans->state = STATE_INITIALIZED;
handle->trans = trans;
return(0);
} }
/** Search for packages to upgrade and add them to the transaction. /** Search for packages to upgrade and add them to the transaction.
@ -100,16 +109,15 @@ int SYMEXPORT alpm_trans_sysupgrade(int enable_downgrade)
trans = handle->trans; trans = handle->trans;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1));
return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync, enable_downgrade)); return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync, enable_downgrade));
} }
/** Add a target to the transaction. /** Add a file target to the transaction.
* @param target the name of the target to add * @param target the name of the file target to add
* @return 0 on success, -1 on error (pm_errno is set accordingly) * @return 0 on success, -1 on error (pm_errno is set accordingly)
*/ */
int SYMEXPORT alpm_trans_addtarget(char *target) int SYMEXPORT alpm_trans_add(char *target)
{ {
pmtrans_t *trans; pmtrans_t *trans;
@ -123,7 +131,87 @@ int SYMEXPORT alpm_trans_addtarget(char *target)
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
return(_alpm_trans_addtarget(trans, target)); if(_alpm_add_loadtarget(trans, handle->db_local, target) == -1) {
/* pm_errno is set by _alpm_add_loadtarget() */
return(-1);
}
return(0);
}
/** Add a sync target to the transaction.
* @param target the name of the sync target to add
* @return 0 on success, -1 on error (pm_errno is set accordingly)
*/
int SYMEXPORT alpm_trans_sync(char *target)
{
pmtrans_t *trans;
ALPM_LOG_FUNC;
/* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
trans = handle->trans;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
if(_alpm_sync_addtarget(trans, handle->db_local, handle->dbs_sync, target) == -1) {
/* pm_errno is set by _alpm_sync_loadtarget() */
return(-1);
}
return(0);
}
int SYMEXPORT alpm_trans_remove(char *target)
{
ALPM_LOG_FUNC;
pmtrans_t *trans;
ALPM_LOG_FUNC;
/* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
trans = handle->trans;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
if(_alpm_remove_loadtarget(trans, handle->db_local, target) == -1) {
/* pm_errno is set by _alpm_remove_loadtarget() */
return(-1);
}
return(0);
}
static alpm_list_t *check_arch(alpm_list_t *pkgs)
{
alpm_list_t *i;
alpm_list_t *invalid = NULL;
const char *arch = alpm_option_get_arch();
if(!arch) {
return(NULL);
}
for(i = pkgs; i; i = i->next) {
pmpkg_t *pkg = i->data;
const char *pkgarch = alpm_pkg_get_arch(pkg);
if(strcmp(pkgarch,arch) && strcmp(pkgarch,"any")) {
char *string;
const char *pkgname = alpm_pkg_get_name(pkg);
const char *pkgver = alpm_pkg_get_version(pkg);
size_t len = strlen(pkgname) + strlen(pkgver) + strlen(pkgarch) + 3;
MALLOC(string, len, RET_ERR(PM_ERR_MEMORY, invalid));
sprintf(string, "%s-%s-%s", pkgname, pkgver, pkgarch);
invalid = alpm_list_add(invalid, string);
}
}
return(invalid);
} }
/** Prepare a transaction. /** Prepare a transaction.
@ -133,16 +221,47 @@ int SYMEXPORT alpm_trans_addtarget(char *target)
*/ */
int SYMEXPORT alpm_trans_prepare(alpm_list_t **data) int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
{ {
pmtrans_t *trans;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); trans = handle->trans;
ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
return(_alpm_trans_prepare(handle->trans, data)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
/* If there's nothing to do, return without complaining */
if(trans->add == NULL && trans->remove == NULL) {
return(0);
}
alpm_list_t *invalid = check_arch(trans->add);
if(invalid) {
if(data) {
*data = invalid;
}
RET_ERR(PM_ERR_PKG_INVALID_ARCH, -1);
}
if(trans->add == NULL) {
if(_alpm_remove_prepare(trans, handle->db_local, data) == -1) {
/* pm_errno is set by _alpm_remove_prepare() */
return(-1);
}
} else {
if(_alpm_sync_prepare(trans, handle->db_local, handle->dbs_sync, data) == -1) {
/* pm_errno is set by _alpm_sync_prepare() */
return(-1);
}
}
trans->state = STATE_PREPARED;
return(0);
} }
/** Commit a transaction. /** Commit a transaction.
@ -152,17 +271,42 @@ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
*/ */
int SYMEXPORT alpm_trans_commit(alpm_list_t **data) int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
{ {
pmtrans_t *trans;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); trans = handle->trans;
ASSERT(handle->trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1));
ASSERT(!(handle->trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1));
return(_alpm_trans_commit(handle->trans, data)); ASSERT(!(trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1));
/* If there's nothing to do, return without complaining */
if(trans->add == NULL && trans->remove == NULL) {
return(0);
}
trans->state = STATE_COMMITING;
if(trans->add == NULL) {
if(_alpm_remove_packages(trans, handle->db_local) == -1) {
/* pm_errno is set by _alpm_remove_commit() */
return(-1);
}
} else {
if(_alpm_sync_commit(trans, handle->db_local, data) == -1) {
/* pm_errno is set by _alpm_sync_commit() */
return(-1);
}
}
trans->state = STATE_COMMITED;
return(0);
} }
/** Interrupt a transaction. /** Interrupt a transaction.
@ -247,12 +391,10 @@ void _alpm_trans_free(pmtrans_t *trans)
return; return;
} }
if(trans->type == PM_TRANS_TYPE_SYNC || trans->type == PM_TRANS_TYPE_UPGRADE) { alpm_list_free_inner(trans->add, (alpm_list_fn_free)_alpm_pkg_free_trans);
alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free_trans); alpm_list_free(trans->add);
} else { alpm_list_free_inner(trans->remove, (alpm_list_fn_free)_alpm_pkg_free);
alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free); alpm_list_free(trans->remove);
}
alpm_list_free(trans->packages);
FREELIST(trans->skip_add); FREELIST(trans->skip_add);
FREELIST(trans->skip_remove); FREELIST(trans->skip_remove);
@ -260,173 +402,6 @@ void _alpm_trans_free(pmtrans_t *trans)
FREE(trans); FREE(trans);
} }
int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags,
alpm_trans_cb_event event, alpm_trans_cb_conv conv,
alpm_trans_cb_progress progress)
{
ALPM_LOG_FUNC;
/* Sanity checks */
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
trans->type = type;
trans->flags = flags;
trans->cb_event = event;
trans->cb_conv = conv;
trans->cb_progress = progress;
trans->state = STATE_INITIALIZED;
return(0);
}
/** Add a target to the transaction.
* @param trans the current transaction
* @param target the name of the target to add
* @return 0 on success, -1 on error (pm_errno is set accordingly)
*/
int _alpm_trans_addtarget(pmtrans_t *trans, char *target)
{
ALPM_LOG_FUNC;
/* Sanity checks */
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
switch(trans->type) {
case PM_TRANS_TYPE_UPGRADE:
if(_alpm_add_loadtarget(trans, handle->db_local, target) == -1) {
/* pm_errno is set by _alpm_add_loadtarget() */
return(-1);
}
break;
case PM_TRANS_TYPE_REMOVE:
case PM_TRANS_TYPE_REMOVEUPGRADE:
if(_alpm_remove_loadtarget(trans, handle->db_local, target) == -1) {
/* pm_errno is set by _alpm_remove_loadtarget() */
return(-1);
}
break;
case PM_TRANS_TYPE_SYNC:
if(_alpm_sync_addtarget(trans, handle->db_local, handle->dbs_sync, target) == -1) {
/* pm_errno is set by _alpm_sync_loadtarget() */
return(-1);
}
break;
}
return(0);
}
static alpm_list_t *check_arch(alpm_list_t *pkgs)
{
alpm_list_t *i;
alpm_list_t *invalid = NULL;
const char *arch = alpm_option_get_arch();
if(!arch) {
return(NULL);
}
for(i = pkgs; i; i = i->next) {
pmpkg_t *pkg = i->data;
const char *pkgarch = alpm_pkg_get_arch(pkg);
if(strcmp(pkgarch,arch) && strcmp(pkgarch,"any")) {
char *string;
const char *pkgname = alpm_pkg_get_name(pkg);
const char *pkgver = alpm_pkg_get_version(pkg);
size_t len = strlen(pkgname) + strlen(pkgver) + strlen(pkgarch) + 3;
MALLOC(string, len, RET_ERR(PM_ERR_MEMORY, invalid));
sprintf(string, "%s-%s-%s", pkgname, pkgver, pkgarch);
invalid = alpm_list_add(invalid, string);
}
}
return(invalid);
}
int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data)
{
if(data) {
*data = NULL;
}
ALPM_LOG_FUNC;
/* Sanity checks */
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
/* If there's nothing to do, return without complaining */
if(trans->packages == NULL) {
return(0);
}
alpm_list_t *invalid = check_arch(trans->packages);
if(invalid) {
if(data) {
*data = invalid;
}
RET_ERR(PM_ERR_PKG_INVALID_ARCH, -1);
}
switch(trans->type) {
case PM_TRANS_TYPE_REMOVE:
case PM_TRANS_TYPE_REMOVEUPGRADE:
if(_alpm_remove_prepare(trans, handle->db_local, data) == -1) {
/* pm_errno is set by _alpm_remove_prepare() */
return(-1);
}
break;
case PM_TRANS_TYPE_UPGRADE:
case PM_TRANS_TYPE_SYNC:
if(_alpm_sync_prepare(trans, handle->db_local, handle->dbs_sync, data) == -1) {
/* pm_errno is set by _alpm_sync_prepare() */
return(-1);
}
break;
}
trans->state = STATE_PREPARED;
return(0);
}
int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data)
{
ALPM_LOG_FUNC;
if(data!=NULL)
*data = NULL;
/* Sanity checks */
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
/* If there's nothing to do, return without complaining */
if(trans->packages == NULL) {
return(0);
}
trans->state = STATE_COMMITING;
switch(trans->type) {
case PM_TRANS_TYPE_REMOVE:
case PM_TRANS_TYPE_REMOVEUPGRADE:
if(_alpm_remove_commit(trans, handle->db_local) == -1) {
/* pm_errno is set by _alpm_remove_commit() */
return(-1);
}
break;
case PM_TRANS_TYPE_UPGRADE:
case PM_TRANS_TYPE_SYNC:
if(_alpm_sync_commit(trans, handle->db_local, data) == -1) {
/* pm_errno is set by _alpm_sync_commit() */
return(-1);
}
break;
}
trans->state = STATE_COMMITED;
return(0);
}
/* A cheap grep for text files, returns 1 if a substring /* A cheap grep for text files, returns 1 if a substring
* was found in the text file fn, 0 if it wasn't * was found in the text file fn, 0 if it wasn't
*/ */
@ -526,15 +501,6 @@ cleanup:
return(retval); return(retval);
} }
pmtranstype_t SYMEXPORT alpm_trans_get_type()
{
/* Sanity checks */
ASSERT(handle != NULL, return(-1));
ASSERT(handle->trans != NULL, return(-1));
return handle->trans->type;
}
unsigned int SYMEXPORT alpm_trans_get_flags() unsigned int SYMEXPORT alpm_trans_get_flags()
{ {
/* Sanity checks */ /* Sanity checks */
@ -544,12 +510,21 @@ unsigned int SYMEXPORT alpm_trans_get_flags()
return handle->trans->flags; return handle->trans->flags;
} }
alpm_list_t SYMEXPORT * alpm_trans_get_pkgs() alpm_list_t SYMEXPORT * alpm_trans_get_add()
{ {
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return(NULL)); ASSERT(handle != NULL, return(NULL));
ASSERT(handle->trans != NULL, return(NULL)); ASSERT(handle->trans != NULL, return(NULL));
return handle->trans->packages; return handle->trans->add;
}
alpm_list_t SYMEXPORT * alpm_trans_get_remove()
{
/* Sanity checks */
ASSERT(handle != NULL, return(NULL));
ASSERT(handle->trans != NULL, return(NULL));
return handle->trans->remove;
} }
/* vim: set ts=2 sw=2 noet: */ /* vim: set ts=2 sw=2 noet: */

9
lib/libalpm/trans.h
View File

@ -37,10 +37,10 @@ typedef enum _pmtransstate_t {
/* Transaction */ /* Transaction */
struct __pmtrans_t { struct __pmtrans_t {
pmtranstype_t type;
pmtransflag_t flags; pmtransflag_t flags;
pmtransstate_t state; pmtransstate_t state;
alpm_list_t *packages; /* list of (pmpkg_t *) */ alpm_list_t *add; /* list of (pmpkg_t *) */
alpm_list_t *remove; /* list of (pmpkg_t *) */
alpm_list_t *skip_add; /* list of (char *) */ alpm_list_t *skip_add; /* list of (char *) */
alpm_list_t *skip_remove; /* list of (char *) */ alpm_list_t *skip_remove; /* list of (char *) */
alpm_trans_cb_event cb_event; alpm_trans_cb_event cb_event;
@ -69,12 +69,9 @@ do { \
pmtrans_t *_alpm_trans_new(void); pmtrans_t *_alpm_trans_new(void);
void _alpm_trans_free(pmtrans_t *trans); void _alpm_trans_free(pmtrans_t *trans);
int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags, int _alpm_trans_init(pmtrans_t *trans, pmtransflag_t flags,
alpm_trans_cb_event event, alpm_trans_cb_conv conv, alpm_trans_cb_event event, alpm_trans_cb_conv conv,
alpm_trans_cb_progress progress); alpm_trans_cb_progress progress);
int _alpm_trans_addtarget(pmtrans_t *trans, char *target);
int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data);
int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data);
int _alpm_runscriptlet(const char *root, const char *installfn, int _alpm_runscriptlet(const char *root, const char *installfn,
const char *script, const char *ver, const char *script, const char *ver,
const char *oldver, pmtrans_t *trans); const char *oldver, pmtrans_t *trans);

10
src/pacman/remove.c
View File

@ -51,14 +51,14 @@ int pacman_remove(alpm_list_t *targets)
} }
/* Step 0: create a new transaction */ /* Step 0: create a new transaction */
if(trans_init(PM_TRANS_TYPE_REMOVE, config->flags) == -1) { if(trans_init(config->flags) == -1) {
return(1); return(1);
} }
/* Step 1: add targets to the created transaction */ /* Step 1: add targets to the created transaction */
for(i = targets; i; i = alpm_list_next(i)) { for(i = targets; i; i = alpm_list_next(i)) {
char *targ = alpm_list_getdata(i); char *targ = alpm_list_getdata(i);
if(alpm_trans_addtarget(targ) == -1) { if(alpm_trans_remove(targ) == -1) {
if(pm_errno == PM_ERR_PKG_NOT_FOUND) { if(pm_errno == PM_ERR_PKG_NOT_FOUND) {
printf(_("%s not found, searching for group...\n"), targ); printf(_("%s not found, searching for group...\n"), targ);
pmgrp_t *grp = alpm_db_readgrp(db_local, targ); pmgrp_t *grp = alpm_db_readgrp(db_local, targ);
@ -79,7 +79,7 @@ int pacman_remove(alpm_list_t *targets)
for(p = pkgnames; p; p = alpm_list_next(p)) { for(p = pkgnames; p; p = alpm_list_next(p)) {
char *pkgn = alpm_list_getdata(p); char *pkgn = alpm_list_getdata(p);
if(all || yesno(_(":: Remove %s from group %s?"), pkgn, targ)) { if(all || yesno(_(":: Remove %s from group %s?"), pkgn, targ)) {
if(alpm_trans_addtarget(pkgn) == -1) { if(alpm_trans_remove(pkgn) == -1) {
pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ, pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ,
alpm_strerrorlast()); alpm_strerrorlast());
retval = 1; retval = 1;
@ -129,7 +129,7 @@ int pacman_remove(alpm_list_t *targets)
/* Search for holdpkg in target list */ /* Search for holdpkg in target list */
int holdpkg = 0; int holdpkg = 0;
for(i = alpm_trans_get_pkgs(); i; i = alpm_list_next(i)) { for(i = alpm_trans_get_remove(); i; i = alpm_list_next(i)) {
pmpkg_t *pkg = alpm_list_getdata(i); pmpkg_t *pkg = alpm_list_getdata(i);
if(alpm_list_find_str(config->holdpkg, alpm_pkg_get_name(pkg))) { if(alpm_list_find_str(config->holdpkg, alpm_pkg_get_name(pkg))) {
pm_printf(PM_LOG_WARNING, _("%s is designated as a HoldPkg.\n"), pm_printf(PM_LOG_WARNING, _("%s is designated as a HoldPkg.\n"),
@ -146,7 +146,7 @@ int pacman_remove(alpm_list_t *targets)
if(config->flags & PM_TRANS_FLAG_RECURSE || if(config->flags & PM_TRANS_FLAG_RECURSE ||
config->flags & PM_TRANS_FLAG_CASCADE) { config->flags & PM_TRANS_FLAG_CASCADE) {
/* list transaction targets */ /* list transaction targets */
alpm_list_t *pkglist = alpm_trans_get_pkgs(); alpm_list_t *pkglist = alpm_trans_get_remove();
display_targets(pkglist, 0); display_targets(pkglist, 0);
printf("\n"); printf("\n");

13
src/pacman/sync.c
View File

@ -242,7 +242,7 @@ static int sync_synctree(int level, alpm_list_t *syncs)
alpm_list_t *i; alpm_list_t *i;
int success = 0, ret; int success = 0, ret;
if(trans_init(PM_TRANS_TYPE_SYNC, 0) == -1) { if(trans_init(0) == -1) {
return(0); return(0);
} }
@ -552,7 +552,7 @@ static int process_target(char *targ, alpm_list_t *targets)
{ {
alpm_list_t *sync_dbs = alpm_option_get_syncdbs(); alpm_list_t *sync_dbs = alpm_option_get_syncdbs();
if(alpm_trans_addtarget(targ) == -1) { if(alpm_trans_sync(targ) == -1) {
pmgrp_t *grp = NULL; pmgrp_t *grp = NULL;
int found = 0; int found = 0;
alpm_list_t *j; alpm_list_t *j;
@ -617,7 +617,7 @@ static int sync_trans(alpm_list_t *targets)
alpm_list_t *i; alpm_list_t *i;
/* Step 1: create a new transaction... */ /* Step 1: create a new transaction... */
if(trans_init(PM_TRANS_TYPE_SYNC, config->flags) == -1) { if(trans_init(config->flags) == -1) {
return(1); return(1);
} }
@ -683,7 +683,7 @@ static int sync_trans(alpm_list_t *targets)
goto cleanup; goto cleanup;
} }
packages = alpm_trans_get_pkgs(); packages = alpm_trans_get_add();
if(packages == NULL) { if(packages == NULL) {
/* nothing to do: just exit without complaining */ /* nothing to do: just exit without complaining */
printf(_(" local database is up to date\n")); printf(_(" local database is up to date\n"));
@ -711,7 +711,8 @@ static int sync_trans(alpm_list_t *targets)
goto cleanup; goto cleanup;
} }
display_synctargets(packages); display_targets(alpm_trans_get_remove(), 0);
display_targets(alpm_trans_get_add(), 1);
printf("\n"); printf("\n");
int confirm; int confirm;
@ -788,7 +789,7 @@ int pacman_sync(alpm_list_t *targets)
if(config->op_s_clean) { if(config->op_s_clean) {
int ret = 0; int ret = 0;
if(trans_init(PM_TRANS_TYPE_SYNC, 0) == -1) { if(trans_init(0) == -1) {
return(1); return(1);
} }

10
src/pacman/upgrade.c
View File

@ -42,7 +42,6 @@
int pacman_upgrade(alpm_list_t *targets) int pacman_upgrade(alpm_list_t *targets)
{ {
alpm_list_t *i, *data = NULL; alpm_list_t *i, *data = NULL;
pmtranstype_t transtype = PM_TRANS_TYPE_UPGRADE;
int retval = 0; int retval = 0;
if(targets == NULL) { if(targets == NULL) {
@ -65,7 +64,7 @@ int pacman_upgrade(alpm_list_t *targets)
} }
/* Step 1: create a new transaction */ /* Step 1: create a new transaction */
if(trans_init(transtype, config->flags) == -1) { if(trans_init(config->flags) == -1) {
return(1); return(1);
} }
@ -73,7 +72,7 @@ int pacman_upgrade(alpm_list_t *targets)
printf(_("loading package data...\n")); printf(_("loading package data...\n"));
for(i = targets; i; i = alpm_list_next(i)) { for(i = targets; i; i = alpm_list_next(i)) {
char *targ = alpm_list_getdata(i); char *targ = alpm_list_getdata(i);
if(alpm_trans_addtarget(targ) == -1) { if(alpm_trans_add(targ) == -1) {
pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n",
targ, alpm_strerrorlast()); targ, alpm_strerrorlast());
trans_release(); trans_release();
@ -131,12 +130,13 @@ int pacman_upgrade(alpm_list_t *targets)
/* Step 3: perform the installation */ /* Step 3: perform the installation */
/* print targets and ask user confirmation */ /* print targets and ask user confirmation */
alpm_list_t *packages = alpm_trans_get_pkgs(); alpm_list_t *packages = alpm_trans_get_add();
if(packages == NULL) { /* we are done */ if(packages == NULL) { /* we are done */
trans_release(); trans_release();
return(retval); return(retval);
} }
display_synctargets(packages); display_targets(alpm_trans_get_remove(), 0);
display_targets(alpm_trans_get_add(), 1);
printf("\n"); printf("\n");
int confirm = yesno(_("Proceed with installation?")); int confirm = yesno(_("Proceed with installation?"));
if(!confirm) { if(!confirm) {

35
src/pacman/util.c
View File

@ -45,9 +45,9 @@
#include "callback.h" #include "callback.h"
int trans_init(pmtranstype_t type, pmtransflag_t flags) int trans_init(pmtransflag_t flags)
{ {
if(alpm_trans_init(type, flags, cb_trans_evt, if(alpm_trans_init(flags, cb_trans_evt,
cb_trans_conv, cb_trans_progress) == -1) { cb_trans_conv, cb_trans_progress) == -1) {
pm_fprintf(stderr, PM_LOG_ERROR, _("failed to init transaction (%s)\n"), pm_fprintf(stderr, PM_LOG_ERROR, _("failed to init transaction (%s)\n"),
alpm_strerrorlast()); alpm_strerrorlast());
@ -584,37 +584,6 @@ void display_targets(const alpm_list_t *pkgs, int install)
FREELIST(targets); FREELIST(targets);
} }
/* Display a list of transaction targets.
* `pkgs` should be a list of pmpkg_t's,
* retrieved from a transaction object
*/
void display_synctargets(const alpm_list_t *syncpkgs)
{
const alpm_list_t *i, *j;
alpm_list_t *pkglist = NULL, *rpkglist = NULL;
for(i = syncpkgs; i; i = alpm_list_next(i)) {
pmpkg_t *pkg = alpm_list_getdata(i);
pkglist = alpm_list_add(pkglist, pkg);
/* The removes member contains a list of packages to be removed
* due to the package that is being installed. */
alpm_list_t *to_replace = alpm_pkg_get_removes(pkg);
for(j = to_replace; j; j = alpm_list_next(j)) {
pmpkg_t *rp = alpm_list_getdata(j);
rpkglist = alpm_list_add(rpkglist, rp);
}
}
/* start displaying information */
display_targets(rpkglist, 0);
display_targets(pkglist, 1);
alpm_list_free(pkglist);
alpm_list_free(rpkglist);
}
/* Helper function for comparing strings using the /* Helper function for comparing strings using the
* alpm "compare func" signature */ * alpm "compare func" signature */
int str_cmp(const void *s1, const void *s2) int str_cmp(const void *s1, const void *s2)

3
src/pacman/util.h
View File

@ -37,7 +37,7 @@
/* update speed for the fill_progress based functions */ /* update speed for the fill_progress based functions */
#define UPDATE_SPEED_SEC 0.2f #define UPDATE_SPEED_SEC 0.2f
int trans_init(pmtranstype_t type, pmtransflag_t flags); int trans_init(pmtransflag_t flags);
int trans_release(void); int trans_release(void);
int needs_root(void); int needs_root(void);
int getcols(void); int getcols(void);
@ -54,7 +54,6 @@ void string_display(const char *title, const char *string);
void list_display(const char *title, const alpm_list_t *list); void list_display(const char *title, const alpm_list_t *list);
void list_display_linebreak(const char *title, const alpm_list_t *list); void list_display_linebreak(const char *title, const alpm_list_t *list);
void display_targets(const alpm_list_t *pkgs, int install); void display_targets(const alpm_list_t *pkgs, int install);
void display_synctargets(const alpm_list_t *syncpkgs);
void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg); void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg);
void display_optdepends(pmpkg_t *pkg); void display_optdepends(pmpkg_t *pkg);
int yesno(char *fmt, ...); int yesno(char *fmt, ...);