1 files changed, 350 insertions, 295 deletions

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index f83b0ef9..878971ea 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -26,11 +26,9 @@
 #include <sys/types.h> /* off_t */
 #include <stdlib.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <string.h>
 #include <stdint.h> /* intmax_t */
 #include <unistd.h>
-#include <time.h>
 #include <limits.h>
 
 /* libalpm */
@@ -50,188 +48,200 @@
 #include "delta.h"
 #include "remove.h"
 #include "diskspace.h"
+#include "signing.h"
 
 /** Check for new version of pkg in sync repos
  * (only the first occurrence is considered in sync)
  */
-pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync)
+alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync)
 {
-	ASSERT(pkg != NULL, return(NULL));
-
 	alpm_list_t *i;
-	pmpkg_t *spkg = NULL;
+	alpm_pkg_t *spkg = NULL;
+
+	ASSERT(pkg != NULL, return NULL);
+	pkg->handle->pm_errno = 0;
 
 	for(i = dbs_sync; !spkg && i; i = i->next) {
 		spkg = _alpm_db_get_pkgfromcache(i->data, alpm_pkg_get_name(pkg));
 	}
 
 	if(spkg == NULL) {
-		_alpm_log(PM_LOG_DEBUG, "'%s' not found in sync db => no upgrade\n",
+		_alpm_log(pkg->handle, ALPM_LOG_DEBUG, "'%s' not found in sync db => no upgrade\n",
 				alpm_pkg_get_name(pkg));
-		return(NULL);
+		return NULL;
 	}
 
 	/* compare versions and see if spkg is an upgrade */
 	if(_alpm_pkg_compare_versions(spkg, pkg) > 0) {
-		_alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n",
+		_alpm_log(pkg->handle, ALPM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n",
 					alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg),
 					alpm_pkg_get_version(spkg));
-		return(spkg);
+		return spkg;
 	}
 	/* spkg is not an upgrade */
-	return(NULL);
+	return NULL;
 }
 
-/** Search for packages to upgrade and add them to the transaction.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
-int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade)
+/** Search for packages to upgrade and add them to the transaction. */
+int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
 {
-	alpm_list_t *i, *j, *k;
-	pmtrans_t *trans;
-	pmdb_t *db_local;
-	alpm_list_t *dbs_sync;
-
-	ALPM_LOG_FUNC;
+	alpm_list_t *i, *j;
+	alpm_trans_t *trans;
 
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	CHECK_HANDLE(handle, return -1);
 	trans = handle->trans;
-	db_local = handle->db_local;
-	dbs_sync = handle->dbs_sync;
-	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 != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(handle, ALPM_ERR_TRANS_NOT_INITIALIZED, -1));
 
-	_alpm_log(PM_LOG_DEBUG, "checking for package upgrades\n");
-	for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) {
-		pmpkg_t *lpkg = i->data;
+	_alpm_log(handle, ALPM_LOG_DEBUG, "checking for package upgrades\n");
+	for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
+		alpm_pkg_t *lpkg = i->data;
 
 		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(handle, ALPM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name);
 			continue;
 		}
 
 		/* Search for literal then replacers in each sync database.
 		 * If found, don't check other databases */
-		for(j = dbs_sync; j; j = j->next) {
-			pmdb_t *sdb = j->data;
+		for(j = handle->dbs_sync; j; j = j->next) {
+			alpm_db_t *sdb = j->data;
 			/* Check sdb */
-			pmpkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name);
-			if(spkg) { /* 1. literal was found in sdb */
+			alpm_pkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name);
+			if(spkg) {
+				/* 1. literal was found in sdb */
 				int cmp = _alpm_pkg_compare_versions(spkg, lpkg);
 				if(cmp > 0) {
-					_alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n",
+					_alpm_log(handle, ALPM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n",
 								lpkg->name, lpkg->version, spkg->version);
 					/* check IgnorePkg/IgnoreGroup */
-					if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) {
-						_alpm_log(PM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"),
-										lpkg->name, lpkg->version, spkg->version);
+					if(_alpm_pkg_should_ignore(handle, spkg)
+							|| _alpm_pkg_should_ignore(handle, lpkg)) {
+						_alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"),
+								lpkg->name, lpkg->version, spkg->version);
 					} else {
-						_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
+						_alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
 												spkg->name, spkg->version);
 						trans->add = alpm_list_add(trans->add, spkg);
 					}
 				} else if(cmp < 0) {
 					if(enable_downgrade) {
 						/* check IgnorePkg/IgnoreGroup */
-						if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) {
-							_alpm_log(PM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"),
+						if(_alpm_pkg_should_ignore(handle, spkg)
+								|| _alpm_pkg_should_ignore(handle, lpkg)) {
+							_alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"),
 											lpkg->name, lpkg->version, spkg->version);
 						} else {
-							_alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"),
+							_alpm_log(handle, ALPM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"),
 											lpkg->name, lpkg->version, spkg->version);
 							trans->add = alpm_list_add(trans->add, spkg);
 						}
 					} else {
-						_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
+						_alpm_log(handle, ALPM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
 								lpkg->name, lpkg->version, sdb->treename, spkg->version);
 					}
 				}
-				break; /* jump to next local package */
-			} else { /* 2. search for replacers in sdb */
+				/* jump to next local package */
+				break;
+			} else {
+				/* 2. search for replacers in sdb */
 				int found = 0;
+				alpm_list_t *k, *l;
 				for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) {
 					spkg = k->data;
-					if(alpm_list_find_str(alpm_pkg_get_replaces(spkg), lpkg->name)) {
-						found = 1;
+					for(l = alpm_pkg_get_replaces(spkg); l; l = l->next) {
+						const char *replace = l->data;
+						alpm_depend_t *parsed_replace = _alpm_splitdep(replace);
+						if(_alpm_depcmp(lpkg, parsed_replace)) {
+							found = 1;
+							_alpm_dep_free(parsed_replace);
+							break;
+						}
+						_alpm_dep_free(parsed_replace);
+					}
+					if(found) {
 						/* check IgnorePkg/IgnoreGroup */
-						if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) {
-							_alpm_log(PM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"),
+						if(_alpm_pkg_should_ignore(handle, spkg)
+								|| _alpm_pkg_should_ignore(handle, lpkg)) {
+							_alpm_log(handle, ALPM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"),
 										lpkg->name, lpkg->version, spkg->name, spkg->version);
 							continue;
 						}
 
 						int doreplace = 0;
-						QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, sdb->treename, &doreplace);
+						QUESTION(trans, ALPM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, sdb->treename, &doreplace);
 						if(!doreplace) {
 							continue;
 						}
 
 						/* If spkg is already in the target list, we append lpkg to spkg's
 						 * removes list */
-						pmpkg_t *tpkg = _alpm_pkg_find(trans->add, spkg->name);
+						alpm_pkg_t *tpkg = _alpm_pkg_find(trans->add, spkg->name);
 						if(tpkg) {
 							/* sanity check, multiple repos can contain spkg->name */
 							if(tpkg->origin_data.db != sdb) {
-								_alpm_log(PM_LOG_WARNING, _("cannot replace %s by %s\n"),
+								_alpm_log(handle, ALPM_LOG_WARNING, _("cannot replace %s by %s\n"),
 													lpkg->name, spkg->name);
 								continue;
 							}
-							_alpm_log(PM_LOG_DEBUG, "appending %s to the removes list of %s\n",
+							_alpm_log(handle, ALPM_LOG_DEBUG, "appending %s to the removes list of %s\n",
 												lpkg->name, tpkg->name);
 							tpkg->removes = alpm_list_add(tpkg->removes, lpkg);
 							/* check the to-be-replaced package's reason field */
-							if(alpm_pkg_get_reason(lpkg) == PM_PKG_REASON_EXPLICIT) {
-								tpkg->reason = PM_PKG_REASON_EXPLICIT;
+							if(alpm_pkg_get_reason(lpkg) == ALPM_PKG_REASON_EXPLICIT) {
+								tpkg->reason = ALPM_PKG_REASON_EXPLICIT;
 							}
-						} else { /* add spkg to the target list */
+						} else {
+							/* add spkg to the target list */
 							/* copy over reason */
 							spkg->reason = alpm_pkg_get_reason(lpkg);
 							spkg->removes = alpm_list_add(NULL, lpkg);
-							_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
+							_alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
 													spkg->name, spkg->version);
 							trans->add = alpm_list_add(trans->add, spkg);
 						}
 					}
 				}
 				if(found) {
-					break; /* jump to next local package */
+					/* jump to next local package */
+					break;
 				}
 			}
 		}
 	}
 
-	return(0);
+	return 0;
 }
 
 /** Find group members across a list of databases.
  * If a member exists in several databases, only the first database is used.
  * IgnorePkg is also handled.
- * @param dbs the list of pmdb_t *
+ * @param dbs the list of alpm_db_t *
  * @pram name the name of the group
- * @return the list of pmpkg_t * (caller is responsible for alpm_list_free)
+ * @return the list of alpm_pkg_t * (caller is responsible for alpm_list_free)
  */
-alpm_list_t SYMEXPORT *alpm_find_grp_pkgs(alpm_list_t *dbs,
+alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs,
 		const char *name)
 {
 	alpm_list_t *i, *j, *pkgs = NULL, *ignorelist = NULL;
 
 	for(i = dbs; i; i = i->next) {
-		pmdb_t *db = i->data;
-		pmgrp_t *grp = alpm_db_readgrp(db, name);
+		alpm_db_t *db = i->data;
+		alpm_group_t *grp = alpm_db_readgroup(db, name);
 
 		if(!grp)
 			continue;
 
-		for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
-			pmpkg_t *pkg = j->data;
+		for(j = grp->packages; j; j = j->next) {
+			alpm_pkg_t *pkg = j->data;
 
 			if(_alpm_pkg_find(ignorelist, alpm_pkg_get_name(pkg))) {
 				continue;
 			}
-			if(_alpm_pkg_should_ignore(pkg)) {
+			if(_alpm_pkg_should_ignore(db->handle, pkg)) {
 				ignorelist = alpm_list_add(ignorelist, pkg);
 				int install = 0;
-				QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg,
+				QUESTION(db->handle->trans, ALPM_TRANS_CONV_INSTALL_IGNOREPKG, pkg,
 						NULL, NULL, &install);
 				if(!install)
 					continue;
@@ -242,28 +252,29 @@ alpm_list_t SYMEXPORT *alpm_find_grp_pkgs(alpm_list_t *dbs,
 		}
 	}
 	alpm_list_free(ignorelist);
-	return(pkgs);
+	return pkgs;
 }
 
 /** Compute the size of the files that will be downloaded to install a
  * package.
  * @param newpkg the new package to upgrade to
  */
-static int compute_download_size(pmpkg_t *newpkg)
+static int compute_download_size(alpm_pkg_t *newpkg)
 {
 	const char *fname;
 	char *fpath;
 	off_t size = 0;
+	alpm_handle_t *handle = newpkg->handle;
 
 	if(newpkg->origin != PKG_FROM_SYNCDB) {
 		newpkg->infolevel |= INFRQ_DSIZE;
 		newpkg->download_size = 0;
-		return(0);
+		return 0;
 	}
 
 	fname = alpm_pkg_get_filename(newpkg);
-	ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1));
-	fpath = _alpm_filecache_find(fname);
+	ASSERT(fname != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1));
+	fpath = _alpm_filecache_find(handle, fname);
 
 	if(fpath) {
 		FREE(fpath);
@@ -272,16 +283,16 @@ static int compute_download_size(pmpkg_t *newpkg)
 		off_t dltsize;
 		off_t pkgsize = alpm_pkg_get_size(newpkg);
 
-		dltsize = _alpm_shortest_delta_path(
+		dltsize = _alpm_shortest_delta_path(handle,
 			alpm_pkg_get_deltas(newpkg),
 			alpm_pkg_get_filename(newpkg),
 			&newpkg->delta_path);
 
 		if(newpkg->delta_path && (dltsize < pkgsize * MAX_DELTA_RATIO)) {
-			_alpm_log(PM_LOG_DEBUG, "using delta size\n");
+			_alpm_log(handle, ALPM_LOG_DEBUG, "using delta size\n");
 			size = dltsize;
 		} else {
-			_alpm_log(PM_LOG_DEBUG, "using package size\n");
+			_alpm_log(handle, ALPM_LOG_DEBUG, "using package size\n");
 			size = alpm_pkg_get_size(newpkg);
 			alpm_list_free(newpkg->delta_path);
 			newpkg->delta_path = NULL;
@@ -290,42 +301,46 @@ static int compute_download_size(pmpkg_t *newpkg)
 		size = alpm_pkg_get_size(newpkg);
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "setting download size %jd for pkg %s\n",
+	_alpm_log(handle, ALPM_LOG_DEBUG, "setting download size %jd for pkg %s\n",
 			(intmax_t)size, alpm_pkg_get_name(newpkg));
 
 	newpkg->infolevel |= INFRQ_DSIZE;
 	newpkg->download_size = size;
-	return(0);
+	return 0;
 }
 
-int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data)
+int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 {
+	alpm_list_t *i, *j;
 	alpm_list_t *deps = NULL;
 	alpm_list_t *unresolvable = NULL;
-	alpm_list_t *i, *j;
 	alpm_list_t *remove = NULL;
 	int ret = 0;
-
-	ALPM_LOG_FUNC;
-
-	ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	alpm_trans_t *trans = handle->trans;
 
 	if(data) {
 		*data = NULL;
 	}
 
-	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
+	/* ensure all sync database are valid since we will be using them */
+	for(i = handle->dbs_sync; i; i = i->next) {
+		const alpm_db_t *db = i->data;
+		if(!(db->status & DB_STATUS_VALID)) {
+			RET_ERR(handle, ALPM_ERR_DB_INVALID, -1);
+		}
+	}
+
+	if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {
 		alpm_list_t *resolved = NULL; /* target list after resolvedeps */
 
 		/* Build up list by repeatedly resolving each transaction package */
 		/* Resolve targets dependencies */
-		EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL);
-		_alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n");
+		EVENT(trans, ALPM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "resolving target's dependencies\n");
 
 		/* build remove list for resolvedeps */
 		for(i = trans->add; i; i = i->next) {
-			pmpkg_t *spkg = i->data;
+			alpm_pkg_t *spkg = i->data;
 			for(j = spkg->removes; j; j = j->next) {
 				remove = alpm_list_add(remove, j->data);
 			}
@@ -333,14 +348,14 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 
 		/* Compute the fake local database for resolvedeps (partial fix for the
 		 * phonon/qt issue) */
-		alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(db_local),
+		alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local),
 				trans->add, _alpm_pkg_cmp);
 
 		/* Resolve packages in the transaction one at a time, in addition
 		   building up a list of packages which could not be resolved. */
 		for(i = trans->add; i; i = i->next) {
-			pmpkg_t *pkg = i->data;
-			if(_alpm_resolvedeps(localpkgs, dbs_sync, pkg, trans->add,
+			alpm_pkg_t *pkg = i->data;
+			if(_alpm_resolvedeps(handle, localpkgs, pkg, trans->add,
 						&resolved, remove, data) == -1) {
 				unresolvable = alpm_list_add(unresolvable, pkg);
 			}
@@ -353,14 +368,14 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		   see if they'd like to ignore them rather than failing the sync */
 		if(unresolvable != NULL) {
 			int remove_unresolvable = 0;
-			QUESTION(handle->trans, PM_TRANS_CONV_REMOVE_PKGS, unresolvable,
+			QUESTION(trans, ALPM_TRANS_CONV_REMOVE_PKGS, unresolvable,
 					NULL, NULL, &remove_unresolvable);
-			if (remove_unresolvable) {
+			if(remove_unresolvable) {
 				/* User wants to remove the unresolvable packages from the
 				   transaction. The packages will be removed from the actual
 				   transaction when the transaction packages are replaced with a
 				   dependency-reordered list below */
-				pm_errno = 0; /* pm_errno was set by resolvedeps */
+				handle->pm_errno = 0; /* pm_errno was set by resolvedeps */
 				if(data) {
 					alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free);
 					alpm_list_free(*data);
@@ -376,9 +391,9 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 
 		/* Set DEPEND reason for pulled packages */
 		for(i = resolved; i; i = i->next) {
-			pmpkg_t *pkg = i->data;
+			alpm_pkg_t *pkg = i->data;
 			if(!_alpm_pkg_find(trans->add, pkg->name)) {
-				pkg->reason = PM_PKG_REASON_DEPEND;
+				pkg->reason = ALPM_PKG_REASON_DEPEND;
 			}
 		}
 
@@ -388,25 +403,25 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 
 		/* re-order w.r.t. dependencies */
 		alpm_list_free(trans->add);
-		trans->add = _alpm_sortbydeps(resolved, 0);
+		trans->add = _alpm_sortbydeps(handle, resolved, 0);
 		alpm_list_free(resolved);
 
-		EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
+		EVENT(trans, ALPM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
 	}
 
-	if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) {
+	if(!(trans->flags & ALPM_TRANS_FLAG_NOCONFLICTS)) {
 		/* check for inter-conflicts and whatnot */
-		EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL);
+		EVENT(trans, ALPM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL);
 
-		_alpm_log(PM_LOG_DEBUG, "looking for conflicts\n");
+		_alpm_log(handle, ALPM_LOG_DEBUG, "looking for conflicts\n");
 
 		/* 1. check for conflicts in the target list */
-		_alpm_log(PM_LOG_DEBUG, "check targets vs targets\n");
-		deps = _alpm_innerconflicts(trans->add);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "check targets vs targets\n");
+		deps = _alpm_innerconflicts(handle, trans->add);
 
 		for(i = deps; i; i = i->next) {
-			pmconflict_t *conflict = i->data;
-			pmpkg_t *rsync, *sync, *sync1, *sync2;
+			alpm_conflict_t *conflict = i->data;
+			alpm_pkg_t *rsync, *sync, *sync1, *sync2;
 
 			/* have we already removed one of the conflicting targets? */
 			sync1 = _alpm_pkg_find(trans->add, conflict->package1);
@@ -415,12 +430,12 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 				continue;
 			}
 
-			_alpm_log(PM_LOG_DEBUG, "conflicting packages in the sync list: '%s' <-> '%s'\n",
+			_alpm_log(handle, ALPM_LOG_DEBUG, "conflicting packages in the sync list: '%s' <-> '%s'\n",
 					conflict->package1, conflict->package2);
 
 			/* if sync1 provides sync2, we remove sync2 from the targets, and vice versa */
-			pmdepend_t *dep1 = _alpm_splitdep(conflict->package1);
-			pmdepend_t *dep2 = _alpm_splitdep(conflict->package2);
+			alpm_depend_t *dep1 = _alpm_splitdep(conflict->package1);
+			alpm_depend_t *dep2 = _alpm_splitdep(conflict->package2);
 			if(_alpm_depcmp(sync1, dep2)) {
 				rsync = sync2;
 				sync = sync1;
@@ -428,11 +443,11 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 				rsync = sync1;
 				sync = sync2;
 			} else {
-				_alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
-				pm_errno = PM_ERR_CONFLICTING_DEPS;
+				_alpm_log(handle, ALPM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
+				handle->pm_errno = ALPM_ERR_CONFLICTING_DEPS;
 				ret = -1;
 				if(data) {
-					pmconflict_t *newconflict = _alpm_conflict_dup(conflict);
+					alpm_conflict_t *newconflict = _alpm_conflict_dup(conflict);
 					if(newconflict) {
 						*data = alpm_list_add(*data, newconflict);
 					}
@@ -447,7 +462,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			_alpm_dep_free(dep2);
 
 			/* Prints warning */
-			_alpm_log(PM_LOG_WARNING,
+			_alpm_log(handle, ALPM_LOG_WARNING,
 					_("removing '%s' from target list because it conflicts with '%s'\n"),
 					rsync->name, sync->name);
 			trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL);
@@ -460,17 +475,17 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		deps = NULL;
 
 		/* 2. we check for target vs db conflicts (and resolve)*/
-		_alpm_log(PM_LOG_DEBUG, "check targets vs db and db vs targets\n");
-		deps = _alpm_outerconflicts(db_local, trans->add);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "check targets vs db and db vs targets\n");
+		deps = _alpm_outerconflicts(handle->db_local, trans->add);
 
 		for(i = deps; i; i = i->next) {
-			pmconflict_t *conflict = i->data;
+			alpm_conflict_t *conflict = i->data;
 
 			/* if conflict->package2 (the local package) is not elected for removal,
 			   we ask the user */
 			int found = 0;
 			for(j = trans->add; j && !found; j = j->next) {
-				pmpkg_t *spkg = j->data;
+				alpm_pkg_t *spkg = j->data;
 				if(_alpm_pkg_find(spkg->removes, conflict->package2)) {
 					found = 1;
 				}
@@ -479,24 +494,24 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 				continue;
 			}
 
-			_alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
+			_alpm_log(handle, ALPM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
 					conflict->package1, conflict->package2);
 
-			pmpkg_t *sync = _alpm_pkg_find(trans->add, conflict->package1);
-			pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2);
+			alpm_pkg_t *sync = _alpm_pkg_find(trans->add, conflict->package1);
+			alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2);
 			int doremove = 0;
-			QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1,
+			QUESTION(trans, ALPM_TRANS_CONV_CONFLICT_PKG, conflict->package1,
 							conflict->package2, conflict->reason, &doremove);
 			if(doremove) {
 				/* append to the removes list */
-				_alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2);
+				_alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2);
 				sync->removes = alpm_list_add(sync->removes, local);
 			} else { /* abort */
-				_alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
-				pm_errno = PM_ERR_CONFLICTING_DEPS;
+				_alpm_log(handle, ALPM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
+				handle->pm_errno = ALPM_ERR_CONFLICTING_DEPS;
 				ret = -1;
 				if(data) {
-					pmconflict_t *newconflict = _alpm_conflict_dup(conflict);
+					alpm_conflict_t *newconflict = _alpm_conflict_dup(conflict);
 					if(newconflict) {
 						*data = alpm_list_add(*data, newconflict);
 					}
@@ -506,28 +521,29 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 				goto cleanup;
 			}
 		}
-		EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL);
+		EVENT(trans, ALPM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL);
 		alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_conflict_free);
 		alpm_list_free(deps);
 	}
 
 	/* Build trans->remove list */
 	for(i = trans->add; i; i = i->next) {
-		pmpkg_t *spkg = i->data;
+		alpm_pkg_t *spkg = i->data;
 		for(j = spkg->removes; j; j = j->next) {
-			pmpkg_t *rpkg = j->data;
+			alpm_pkg_t *rpkg = j->data;
 			if(!_alpm_pkg_find(trans->remove, rpkg->name)) {
-				_alpm_log(PM_LOG_DEBUG, "adding '%s' to remove list\n", rpkg->name);
+				_alpm_log(handle, ALPM_LOG_DEBUG, "adding '%s' to remove list\n", rpkg->name);
 				trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(rpkg));
 			}
 		}
 	}
 
-	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
-		_alpm_log(PM_LOG_DEBUG, "checking dependencies\n");
-		deps = alpm_checkdeps(_alpm_db_get_pkgcache(db_local), 1, trans->remove, trans->add);
+	if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "checking dependencies\n");
+		deps = alpm_checkdeps(handle, _alpm_db_get_pkgcache(handle->db_local),
+				trans->remove, trans->add, 1);
 		if(deps) {
-			pm_errno = PM_ERR_UNSATISFIED_DEPS;
+			handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS;
 			ret = -1;
 			if(data) {
 				*data = deps;
@@ -540,7 +556,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 	}
 	for(i = trans->add; i; i = i->next) {
 		/* update download size field */
-		pmpkg_t *spkg = i->data;
+		alpm_pkg_t *spkg = i->data;
 		if(compute_download_size(spkg) != 0) {
 			ret = -1;
 			goto cleanup;
@@ -551,7 +567,7 @@ cleanup:
 	alpm_list_free(unresolvable);
 	alpm_list_free(remove);
 
-	return(ret);
+	return ret;
 }
 
 /** Returns the size of the files that will be downloaded to install a
@@ -559,18 +575,18 @@ cleanup:
  * @param newpkg the new package to upgrade to
  * @return the size of the download
  */
-off_t SYMEXPORT alpm_pkg_download_size(pmpkg_t *newpkg)
+off_t SYMEXPORT alpm_pkg_download_size(alpm_pkg_t *newpkg)
 {
 	if(!(newpkg->infolevel & INFRQ_DSIZE)) {
 		compute_download_size(newpkg);
 	}
-	return(newpkg->download_size);
+	return newpkg->download_size;
 }
 
 static int endswith(const char *filename, const char *extension)
 {
 	const char *s = filename + strlen(filename) - strlen(extension);
-	return(strcmp(s, extension) == 0);
+	return strcmp(s, extension) == 0;
 }
 
 /** Applies delta files to create an upgraded package file.
@@ -578,18 +594,19 @@ static int endswith(const char *filename, const char *extension)
  * All intermediate files are deleted, leaving only the starting and
  * ending package files.
  *
- * @param trans the transaction
+ * @param handle the context handle
  *
  * @return 0 if all delta files were able to be applied, 1 otherwise.
  */
-static int apply_deltas(pmtrans_t *trans)
+static int apply_deltas(alpm_handle_t *handle)
 {
 	alpm_list_t *i;
 	int ret = 0;
-	const char *cachedir = _alpm_filecache_setup();
+	const char *cachedir = _alpm_filecache_setup(handle);
+	alpm_trans_t *trans = handle->trans;
 
 	for(i = trans->add; i; i = i->next) {
-		pmpkg_t *spkg = i->data;
+		alpm_pkg_t *spkg = i->data;
 		alpm_list_t *delta_path = spkg->delta_path;
 		alpm_list_t *dlts = NULL;
 
@@ -598,23 +615,23 @@ static int apply_deltas(pmtrans_t *trans)
 		}
 
 		for(dlts = delta_path; dlts; dlts = dlts->next) {
-			pmdelta_t *d = dlts->data;
+			alpm_delta_t *d = dlts->data;
 			char *delta, *from, *to;
 			char command[PATH_MAX];
 			size_t len = 0;
 
-			delta = _alpm_filecache_find(d->delta);
+			delta = _alpm_filecache_find(handle, d->delta);
 			/* the initial package might be in a different cachedir */
 			if(dlts == delta_path) {
-				from = _alpm_filecache_find(d->from);
+				from = _alpm_filecache_find(handle, d->from);
 			} else {
 				/* len = cachedir len + from len + '/' + null */
 				len = strlen(cachedir) + strlen(d->from) + 2;
-				CALLOC(from, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, 1));
+				CALLOC(from, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, 1));
 				snprintf(from, len, "%s/%s", cachedir, d->from);
 			}
 			len = strlen(cachedir) + strlen(d->to) + 2;
-			CALLOC(to, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, 1));
+			CALLOC(to, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, 1));
 			snprintf(to, len, "%s/%s", cachedir, d->to);
 
 			/* build the patch command */
@@ -625,13 +642,13 @@ static int apply_deltas(pmtrans_t *trans)
 				snprintf(command, PATH_MAX, "xdelta3 -d -q -s %s %s %s", from, delta, to);
 			}
 
-			_alpm_log(PM_LOG_DEBUG, "command: %s\n", command);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "command: %s\n", command);
 
-			EVENT(trans, PM_TRANS_EVT_DELTA_PATCH_START, d->to, d->delta);
+			EVENT(trans, ALPM_TRANS_EVT_DELTA_PATCH_START, d->to, d->delta);
 
 			int retval = system(command);
 			if(retval == 0) {
-				EVENT(trans, PM_TRANS_EVT_DELTA_PATCH_DONE, NULL, NULL);
+				EVENT(trans, ALPM_TRANS_EVT_DELTA_PATCH_DONE, NULL, NULL);
 
 				/* delete the delta file */
 				unlink(delta);
@@ -649,14 +666,15 @@ static int apply_deltas(pmtrans_t *trans)
 
 			if(retval != 0) {
 				/* one delta failed for this package, cancel the remaining ones */
-				EVENT(trans, PM_TRANS_EVT_DELTA_PATCH_FAILED, NULL, NULL);
+				EVENT(trans, ALPM_TRANS_EVT_DELTA_PATCH_FAILED, NULL, NULL);
+				handle->pm_errno = ALPM_ERR_DLT_PATCHFAILED;
 				ret = 1;
 				break;
 			}
 		}
 	}
 
-	return(ret);
+	return ret;
 }
 
 /** Compares the md5sum of a file to the expected value.
@@ -665,50 +683,71 @@ static int apply_deltas(pmtrans_t *trans)
  * should be deleted.
  *
  * @param trans the transaction
- * @param filename the filename of the file to test
- * @param md5sum the expected md5sum of the file
+ * @param filename the absolute path of the file to test
+ * @param reason an error code indicating the reason for package invalidity
  *
- * @return 0 if the md5sum matched, 1 if not, -1 in case of errors
+ * @return 1 if file was removed, 0 otherwise
  */
-static int test_md5sum(pmtrans_t *trans, const char *filename,
-		const char *md5sum)
+static int prompt_to_delete(alpm_trans_t *trans, const char *filepath,
+		enum _alpm_errno_t reason)
+{
+	int doremove = 0;
+	QUESTION(trans, ALPM_TRANS_CONV_CORRUPTED_PKG, (char *)filepath,
+			&reason, NULL, &doremove);
+	if(doremove) {
+		unlink(filepath);
+	}
+	return doremove;
+}
+
+static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas,
+		alpm_list_t **data)
 {
-	char *filepath;
-	int ret;
+	int errors = 0, ret = 0;
+	alpm_list_t *i;
+	alpm_trans_t *trans = handle->trans;
+
+	if(!deltas) {
+		return 0;
+	}
 
-	filepath = _alpm_filecache_find(filename);
+	/* Check integrity of deltas */
+	EVENT(trans, ALPM_TRANS_EVT_DELTA_INTEGRITY_START, NULL, NULL);
 
-	ret = _alpm_test_md5sum(filepath, md5sum);
+	for(i = deltas; i; i = i->next) {
+		alpm_delta_t *d = alpm_list_getdata(i);
+		char *filepath = _alpm_filecache_find(handle, d->delta);
 
-	if(ret == 1) {
-		int doremove = 0;
-		QUESTION(trans, PM_TRANS_CONV_CORRUPTED_PKG, (char *)filename,
-				NULL, NULL, &doremove);
-		if(doremove) {
-			unlink(filepath);
+		ret = _alpm_test_md5sum(filepath, d->delta_md5);
+		if(ret != 0) {
+			prompt_to_delete(trans, filepath, ALPM_ERR_DLT_INVALID);
+			errors++;
+			*data = alpm_list_add(*data, strdup(d->delta));
 		}
+		FREE(filepath);
 	}
+	if(errors) {
+		handle->pm_errno = ALPM_ERR_DLT_INVALID;
+		return -1;
+	}
+	EVENT(trans, ALPM_TRANS_EVT_DELTA_INTEGRITY_DONE, NULL, NULL);
 
-	FREE(filepath);
-
-	return(ret);
+	/* Use the deltas to generate the packages */
+	EVENT(trans, ALPM_TRANS_EVT_DELTA_PATCHES_START, NULL, NULL);
+	ret = apply_deltas(handle);
+	EVENT(trans, ALPM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL);
+	return ret;
 }
 
-int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
+static int download_files(alpm_handle_t *handle, alpm_list_t **deltas)
 {
-	alpm_list_t *i, *j, *files = NULL;
-	alpm_list_t *deltas = NULL;
-	size_t numtargs, current = 0, replaces = 0;
+	const char *cachedir;
+	alpm_list_t *i, *j;
+	alpm_list_t *files = NULL;
 	int errors = 0;
-	const char *cachedir = NULL;
-	int ret = -1;
-
-	ALPM_LOG_FUNC;
 
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-
-	cachedir = _alpm_filecache_setup();
-	trans->state = STATE_DOWNLOADING;
+	cachedir = _alpm_filecache_setup(handle);
+	handle->trans->state = STATE_DOWNLOADING;
 
 	/* Total progress - figure out the total download size if required to
 	 * pass to the callback. This function is called once, and it is up to the
@@ -716,8 +755,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	if(handle->totaldlcb) {
 		off_t total_size = (off_t)0;
 		/* sum up the download size for each package and store total */
-		for(i = trans->add; i; i = i->next) {
-			pmpkg_t *spkg = i->data;
+		for(i = handle->trans->add; i; i = i->next) {
+			alpm_pkg_t *spkg = i->data;
 			total_size += spkg->download_size;
 		}
 		handle->totaldlcb(total_size);
@@ -725,62 +764,88 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 
 	/* group sync records by repository and download */
 	for(i = handle->dbs_sync; i; i = i->next) {
-		pmdb_t *current = i->data;
+		alpm_db_t *current = i->data;
 
-		for(j = trans->add; j; j = j->next) {
-			pmpkg_t *spkg = j->data;
+		for(j = handle->trans->add; j; j = j->next) {
+			alpm_pkg_t *spkg = j->data;
 
 			if(spkg->origin != PKG_FROM_FILE && current == spkg->origin_data.db) {
-				const char *fname = NULL;
-
-				fname = alpm_pkg_get_filename(spkg);
-				ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1));
 				alpm_list_t *delta_path = spkg->delta_path;
 				if(delta_path) {
 					/* using deltas */
-					alpm_list_t *dlts = NULL;
-
+					alpm_list_t *dlts;
 					for(dlts = delta_path; dlts; dlts = dlts->next) {
-						pmdelta_t *d = dlts->data;
+						alpm_delta_t *delta = dlts->data;
+						if(delta->download_size != 0) {
+							struct dload_payload *dpayload;
 
-						if(d->download_size != 0) {
-							/* add the delta filename to the download list if needed */
-							files = alpm_list_add(files, strdup(d->delta));
-						}
+							CALLOC(dpayload, 1, sizeof(*dpayload), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+							STRDUP(dpayload->filename, delta->delta, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+							dpayload->max_size = delta->download_size;
 
+							files = alpm_list_add(files, dpayload);
+						}
 						/* keep a list of all the delta files for md5sums */
-						deltas = alpm_list_add(deltas, d);
+						*deltas = alpm_list_add(*deltas, delta);
 					}
 
-				} else {
-					/* not using deltas */
-					if(spkg->download_size != 0) {
-						/* add the filename to the download list if needed */
-						files = alpm_list_add(files, strdup(fname));
-					}
+				} else if(spkg->download_size != 0) {
+					struct dload_payload *payload;
+
+					ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1));
+					CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+					STRDUP(payload->filename, spkg->filename, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+					payload->max_size = alpm_pkg_get_size(spkg);
+
+					files = alpm_list_add(files, payload);
 				}
 
 			}
 		}
 
 		if(files) {
-			EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL);
-			errors = _alpm_download_files(files, current->servers, cachedir);
+			EVENT(handle->trans, ALPM_TRANS_EVT_RETRIEVE_START, current->treename, NULL);
+			for(j = files; j; j = j->next) {
+				struct dload_payload *payload = j->data;
+				alpm_list_t *server;
+				int ret = -1;
+				for(server = current->servers; server; server = server->next) {
+					const char *server_url = server->data;
+					size_t len;
+
+					/* print server + filename into a buffer */
+					len = strlen(server_url) + strlen(payload->filename) + 2;
+					CALLOC(payload->fileurl, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+					snprintf(payload->fileurl, len, "%s/%s", server_url, payload->filename);
+					payload->handle = handle;
+					payload->allow_resume = 1;
+
+					ret = _alpm_download(payload, cachedir, NULL);
+					if(ret != -1) {
+						break;
+					}
+				}
+				if(ret == -1) {
+					errors++;
+				}
+			}
 
-			if (errors) {
-				_alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"),
+			alpm_list_free_inner(files, (alpm_list_fn_free)_alpm_dload_payload_free);
+			alpm_list_free(files);
+			files = NULL;
+			if(errors) {
+				_alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files from %s\n"),
 						current->treename);
-				if(pm_errno == 0) {
-					pm_errno = PM_ERR_RETRIEVE;
+				if(handle->pm_errno == 0) {
+					handle->pm_errno = ALPM_ERR_RETRIEVE;
 				}
-				goto error;
+				return -1;
 			}
-			FREELIST(files);
 		}
 	}
 
-	for(j = trans->add; j; j = j->next) {
-		pmpkg_t *pkg = j->data;
+	for(j = handle->trans->add; j; j = j->next) {
+		alpm_pkg_t *pkg = j->data;
 		pkg->infolevel &= ~INFRQ_DSIZE;
 		pkg->download_size = 0;
 	}
@@ -789,70 +854,61 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	if(handle->totaldlcb) {
 		handle->totaldlcb(0);
 	}
+	return 0;
+}
 
-	/* if we have deltas to work with */
-	if(handle->usedelta && deltas) {
-		int ret = 0;
-		errors = 0;
-		/* Check integrity of deltas */
-		EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_START, NULL, NULL);
-
-		for(i = deltas; i; i = i->next) {
-			pmdelta_t *d = alpm_list_getdata(i);
-			const char *filename = alpm_delta_get_filename(d);
-			const char *md5sum = alpm_delta_get_md5sum(d);
-
-			if(test_md5sum(trans, filename, md5sum) != 0) {
-				errors++;
-				*data = alpm_list_add(*data, strdup(filename));
-			}
-		}
-		if(errors) {
-			pm_errno = PM_ERR_DLT_INVALID;
-			goto error;
-		}
-		EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_DONE, NULL, NULL);
+int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
+{
+	alpm_list_t *i;
+	alpm_list_t *deltas = NULL;
+	size_t numtargs, current = 0, replaces = 0;
+	int errors;
+	alpm_trans_t *trans = handle->trans;
 
-		/* Use the deltas to generate the packages */
-		EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_START, NULL, NULL);
-		ret = apply_deltas(trans);
-		EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL);
+	if(download_files(handle, &deltas)) {
+		alpm_list_free(deltas);
+		return -1;
+	}
 
-		if(ret) {
-			pm_errno = PM_ERR_DLT_PATCHFAILED;
-			goto error;
-		}
+	if(validate_deltas(handle, deltas, data)) {
+		alpm_list_free(deltas);
+		return -1;
 	}
+	alpm_list_free(deltas);
 
 	/* Check integrity of packages */
 	numtargs = alpm_list_count(trans->add);
-	EVENT(trans, PM_TRANS_EVT_INTEGRITY_START, NULL, NULL);
+	EVENT(trans, ALPM_TRANS_EVT_INTEGRITY_START, NULL, NULL);
 
 	errors = 0;
+
 	for(i = trans->add; i; i = i->next, current++) {
-		pmpkg_t *spkg = i->data;
+		alpm_pkg_t *spkg = i->data;
 		int percent = (current * 100) / numtargs;
+		const char *filename;
+		char *filepath;
+		alpm_siglevel_t level;
+
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_INTEGRITY_START, "", percent,
+				numtargs, current);
 		if(spkg->origin == PKG_FROM_FILE) {
 			continue; /* pkg_load() has been already called, this package is valid */
 		}
-		PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", percent,
-				numtargs, current);
 
-		const char *filename = alpm_pkg_get_filename(spkg);
-		const char *md5sum = alpm_pkg_get_md5sum(spkg);
+		filename = alpm_pkg_get_filename(spkg);
+		filepath = _alpm_filecache_find(handle, filename);
+		alpm_db_t *sdb = alpm_pkg_get_db(spkg);
+		level = alpm_db_get_siglevel(sdb);
 
-		if(test_md5sum(trans, filename, md5sum) != 0) {
-			errors++;
-			*data = alpm_list_add(*data, strdup(filename));
-			continue;
-		}
 		/* load the package file and replace pkgcache entry with it in the target list */
 		/* TODO: alpm_pkg_get_db() will not work on this target anymore */
-		_alpm_log(PM_LOG_DEBUG, "replacing pkgcache entry with package file for target %s\n", spkg->name);
-		char *filepath = _alpm_filecache_find(filename);
-		pmpkg_t *pkgfile;
-		if(alpm_pkg_load(filepath, 1, &pkgfile) != 0) {
-			_alpm_pkg_free(pkgfile);
+		_alpm_log(handle, ALPM_LOG_DEBUG,
+				"replacing pkgcache entry with package file for target %s\n",
+				spkg->name);
+		alpm_pkg_t *pkgfile =_alpm_pkg_load_internal(handle, filepath, 1, spkg->md5sum,
+				spkg->base64_sig, level);
+		if(!pkgfile) {
+			prompt_to_delete(trans, filepath, handle->pm_errno);
 			errors++;
 			*data = alpm_list_add(*data, strdup(filename));
 			FREE(filepath);
@@ -863,17 +919,21 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 		i->data = pkgfile;
 		_alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */
 	}
-	PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", 100,
+
+	PROGRESS(trans, ALPM_TRANS_PROGRESS_INTEGRITY_START, "", 100,
 			numtargs, current);
-	EVENT(trans, PM_TRANS_EVT_INTEGRITY_DONE, NULL, NULL);
+	EVENT(trans, ALPM_TRANS_EVT_INTEGRITY_DONE, NULL, NULL);
+
+
 	if(errors) {
-		pm_errno = PM_ERR_PKG_INVALID;
-		goto error;
+		if(!handle->pm_errno) {
+			RET_ERR(handle, ALPM_ERR_PKG_INVALID, -1);
+		}
+		return -1;
 	}
 
-	if(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY) {
-		ret = 0;
-		goto error;
+	if(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) {
+		return 0;
 	}
 
 	trans->state = STATE_COMMITING;
@@ -881,61 +941,56 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	replaces = alpm_list_count(trans->remove);
 
 	/* fileconflict check */
-	if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
-		EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL);
+	if(!(trans->flags & ALPM_TRANS_FLAG_FORCE)) {
+		EVENT(trans, ALPM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL);
 
-		_alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n");
-		alpm_list_t *conflict = _alpm_db_find_fileconflicts(db_local, trans,
-								    trans->add, trans->remove);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n");
+		alpm_list_t *conflict = _alpm_db_find_fileconflicts(handle,
+				trans->add, trans->remove);
 		if(conflict) {
-			pm_errno = PM_ERR_FILE_CONFLICTS;
 			if(data) {
 				*data = conflict;
 			} else {
 				alpm_list_free_inner(conflict, (alpm_list_fn_free)_alpm_fileconflict_free);
 				alpm_list_free(conflict);
 			}
-			goto error;
+			RET_ERR(handle, ALPM_ERR_FILE_CONFLICTS, -1);
 		}
 
-		EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL);
+		EVENT(trans, ALPM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL);
 	}
 
 	/* check available disk space */
 	if(handle->checkspace) {
-		EVENT(trans, PM_TRANS_EVT_DISKSPACE_START, NULL, NULL);
+		EVENT(trans, ALPM_TRANS_EVT_DISKSPACE_START, NULL, NULL);
 
-		_alpm_log(PM_LOG_DEBUG, "checking available disk space\n");
-		if(_alpm_check_diskspace(trans, handle->db_local) == -1) {
-			_alpm_log(PM_LOG_ERROR, "%s\n", _("not enough free disk space"));
-			goto error;
+		_alpm_log(handle, ALPM_LOG_DEBUG, "checking available disk space\n");
+		if(_alpm_check_diskspace(handle) == -1) {
+			_alpm_log(handle, ALPM_LOG_ERROR, "%s\n", _("not enough free disk space"));
+			return -1;
 		}
 
-		EVENT(trans, PM_TRANS_EVT_DISKSPACE_DONE, NULL, NULL);
+		EVENT(trans, ALPM_TRANS_EVT_DISKSPACE_DONE, NULL, NULL);
 	}
 
 	/* remove conflicting and to-be-replaced packages */
 	if(replaces) {
-		_alpm_log(PM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n");
+		_alpm_log(handle, ALPM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n");
 		/* we want the frontend to be aware of commit details */
-		if(_alpm_remove_packages(trans, handle->db_local) == -1) {
-			_alpm_log(PM_LOG_ERROR, _("could not commit removal transaction\n"));
-			goto error;
+		if(_alpm_remove_packages(handle) == -1) {
+			_alpm_log(handle, ALPM_LOG_ERROR, _("could not commit removal transaction\n"));
+			return -1;
 		}
 	}
 
 	/* install targets */
-	_alpm_log(PM_LOG_DEBUG, "installing packages\n");
-	if(_alpm_upgrade_packages(trans, handle->db_local) == -1) {
-		_alpm_log(PM_LOG_ERROR, _("could not commit transaction\n"));
-		goto error;
+	_alpm_log(handle, ALPM_LOG_DEBUG, "installing packages\n");
+	if(_alpm_upgrade_packages(handle) == -1) {
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not commit transaction\n"));
+		return -1;
 	}
-	ret = 0;
 
-error:
-	FREELIST(files);
-	alpm_list_free(deltas);
-	return(ret);
+	return 0;
 }
 
 /* vim: set ts=2 sw=2 noet: */