Merge branch 'maint'

Conflicts:
	src/pacman/package.c

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 06afde78..0ca6fec8 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -55,7 +55,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, ALPM_LOG_ERROR, "'%s': %s\n",
+				pm_printf(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, level, &pkg) != 0) {
-			pm_fprintf(stderr, ALPM_LOG_ERROR, "'%s': %s\n",
+			pm_printf(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, ALPM_LOG_ERROR, "'%s': %s\n",
+			pm_printf(ALPM_LOG_ERROR, "'%s': %s\n",
 					targ, alpm_strerror(alpm_errno(config->handle)));
 			alpm_pkg_free(pkg);
 			trans_release();