moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove done and failed msg when loading targets. 

This change is similar to the one made in
3017b71cb5.

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>
This commit is contained in:
Chantry Xavier 2008-02-25 12:10:34 +01:00
parent d5857ee15b
commit c23ecc6160
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pacman/add.c
View File

@ -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. */

4
src/pacman/remove.c
View File

@ -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) {