summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChantry Xavier <shiningxc@gmail.com>2008-02-25 12:10:34 +0100
committerChantry Xavier <shiningxc@gmail.com>2008-02-25 12:10:34 +0100
commitc23ecc6160749e635767cdfbd23760e9e809c949 (patch)
tree8f89703009f3fe0d173c7c63e9e10bdfe09de048
parentd5857ee15b28af5de57614348f930046e122ba85 (diff)
downloadpacman-c23ecc6160749e635767cdfbd23760e9e809c949.tar.gz
pacman-c23ecc6160749e635767cdfbd23760e9e809c949.tar.xz
Remove done and failed msg when loading targets.
This change is similar to the one made in 3017b71cb5cde3aef7e0efb5f49843cccf759956. We had a "loading package data..." message, followed by either "failed" or "done", but it didn't take into account that other warnings / questions could be displayed between. Ref: http://archlinux.org/pipermail/pacman-dev/2008-January/010971.html Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
-rw-r--r--src/pacman/add.c4
-rw-r--r--src/pacman/remove.c4
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 4c5b5c09..e3750e4c 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) {