Merge branch 'maint'

Also bump the devel version on the master branch to 3.2.0devel.

2 files changed, 2 insertions, 6 deletions

diff --git a/src/pacman/add.c b/src/pacman/add.c
index 9d646e11..fd40f005 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -111,18 +111,16 @@ int pacman_add(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = targets; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			printf(_("failed.\n"));
 			fprintf(stderr, _("error: '%s': %s\n"),
 					targ, alpm_strerrorlast());
 			add_cleanup();
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: "compute" the transaction based on targets and flags */
 	/* TODO: No, compute nothing. This is stupid. */
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index a604014e..2fb69d35 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -103,11 +103,10 @@ int pacman_remove(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = finaltargs; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			printf(_("failed.\n"));
 			fprintf(stderr, _("error: '%s': %s\n"),
 					targ, alpm_strerrorlast());
 			remove_cleanup();
@@ -115,7 +114,6 @@ int pacman_remove(alpm_list_t *targets)
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: prepare the transaction based on its type, targets and flags */
 	if(alpm_trans_prepare(&data) == -1) {