Merge remote-tracking branch 'allan/ALPM'

Conflicts:
	lib/libalpm/be_local.c
	lib/libalpm/be_package.c
	lib/libalpm/conflict.c
	lib/libalpm/diskspace.c
	lib/libalpm/dload.c
	lib/libalpm/remove.c

1 files changed, 14 insertions, 14 deletions

diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 31536a43..95b17cc1 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -46,7 +46,7 @@ int pacman_upgrade(alpm_list_t *targets)
 	int retval = 0;
 
 	if(targets == NULL) {
-		pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n"));
+		pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n"));
 		return 1;
 	}
 
@@ -56,7 +56,7 @@ int pacman_upgrade(alpm_list_t *targets)
 		if(strstr(i->data, "://")) {
 			char *str = alpm_fetch_pkgurl(config->handle, i->data);
 			if(str == NULL) {
-				pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n",
+				pm_fprintf(stderr, ALPM_LOG_ERROR, "'%s': %s\n",
 						(char *)i->data, alpm_strerror(alpm_errno(config->handle)));
 				return 1;
 			} else {
@@ -77,13 +77,13 @@ int pacman_upgrade(alpm_list_t *targets)
 		alpm_pkg_t *pkg;
 
 		if(alpm_pkg_load(config->handle, targ, 1, check_sig, &pkg) != 0) {
-			pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n",
+			pm_fprintf(stderr, ALPM_LOG_ERROR, "'%s': %s\n",
 					targ, alpm_strerror(alpm_errno(config->handle)));
 			trans_release();
 			return 1;
 		}
 		if(alpm_add_pkg(config->handle, pkg) == -1) {
-			pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n",
+			pm_fprintf(stderr, ALPM_LOG_ERROR, "'%s': %s\n",
 					targ, alpm_strerror(alpm_errno(config->handle)));
 			alpm_pkg_free(pkg);
 			trans_release();
@@ -95,16 +95,16 @@ int pacman_upgrade(alpm_list_t *targets)
 	/* TODO: No, compute nothing. This is stupid. */
 	if(alpm_trans_prepare(config->handle, &data) == -1) {
 		enum _alpm_errno_t err = alpm_errno(config->handle);
-		pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"),
+		pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"),
 		        alpm_strerror(err));
 		switch(err) {
-			case PM_ERR_PKG_INVALID_ARCH:
+			case ALPM_ERR_PKG_INVALID_ARCH:
 				for(i = data; i; i = alpm_list_next(i)) {
 					char *pkg = alpm_list_getdata(i);
 					printf(_(":: package %s does not have a valid architecture\n"), pkg);
 				}
 				break;
-			case PM_ERR_UNSATISFIED_DEPS:
+			case ALPM_ERR_UNSATISFIED_DEPS:
 				for(i = data; i; i = alpm_list_next(i)) {
 					alpm_depmissing_t *miss = alpm_list_getdata(i);
 					char *depstring = alpm_dep_compute_string(miss->depend);
@@ -116,7 +116,7 @@ int pacman_upgrade(alpm_list_t *targets)
 					free(depstring);
 				}
 				break;
-			case PM_ERR_CONFLICTING_DEPS:
+			case ALPM_ERR_CONFLICTING_DEPS:
 				for(i = data; i; i = alpm_list_next(i)) {
 					alpm_conflict_t *conflict = alpm_list_getdata(i);
 					if(strcmp(conflict->package1, conflict->reason) == 0 ||
@@ -163,26 +163,26 @@ int pacman_upgrade(alpm_list_t *targets)
 
 	if(alpm_trans_commit(config->handle, &data) == -1) {
 		enum _alpm_errno_t err = alpm_errno(config->handle);
-		pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"),
+		pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"),
 				alpm_strerror(err));
 		switch(err) {
-			case PM_ERR_FILE_CONFLICTS:
+			case ALPM_ERR_FILE_CONFLICTS:
 				for(i = data; i; i = alpm_list_next(i)) {
 					alpm_fileconflict_t *conflict = alpm_list_getdata(i);
 					switch(conflict->type) {
-						case PM_FILECONFLICT_TARGET:
+						case ALPM_FILECONFLICT_TARGET:
 							printf(_("%s exists in both '%s' and '%s'\n"),
 									conflict->file, conflict->target, conflict->ctarget);
 							break;
-						case PM_FILECONFLICT_FILESYSTEM:
+						case ALPM_FILECONFLICT_FILESYSTEM:
 							printf(_("%s: %s exists in filesystem\n"),
 									conflict->target, conflict->file);
 							break;
 					}
 				}
 				break;
-			case PM_ERR_PKG_INVALID:
-			case PM_ERR_DLT_INVALID:
+			case ALPM_ERR_PKG_INVALID:
+			case ALPM_ERR_DLT_INVALID:
 				for(i = data; i; i = alpm_list_next(i)) {
 					char *filename = alpm_list_getdata(i);
 					printf(_("%s is invalid or corrupted\n"), filename);