From 3017b71cb5cde3aef7e0efb5f49843cccf759956 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 2 Dec 2007 13:48:49 -0600
Subject: Remove "done" messages from frontend callback function
This should simplify our output a bit when it comes to determining whether
or not we need a newline in our output. A "done" message was almost always
immediately followed by another start message anyway (or some other output),
so it really isn't necessary.
Signed-off-by: Dan McGee <dan@archlinux.org>
---
src/pacman/callback.c | 47 ++++++++++++++++-------------------------------
1 file changed, 16 insertions(+), 31 deletions(-)
(limited to 'src/pacman')
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index dd469ecc..6129d8d7 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -160,36 +160,25 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
switch(event) {
case PM_TRANS_EVT_CHECKDEPS_START:
- printf(_("checking dependencies... "));
+ printf(_("checking dependencies...\n"));
break;
case PM_TRANS_EVT_FILECONFLICTS_START:
if(config->noprogressbar) {
- printf(_("checking for file conflicts... "));
+ printf(_("checking for file conflicts...\n"));
}
break;
case PM_TRANS_EVT_RESOLVEDEPS_START:
- printf(_("resolving dependencies... "));
+ printf(_("resolving dependencies...\n"));
break;
case PM_TRANS_EVT_INTERCONFLICTS_START:
- printf(_("looking for inter-conflicts... "));
- break;
- case PM_TRANS_EVT_FILECONFLICTS_DONE:
- if(config->noprogressbar) {
- printf(_("done.\n"));
- }
- break;
- case PM_TRANS_EVT_EXTRACT_DONE:
- /* nothing */
+ printf(_("looking for inter-conflicts...\n"));
break;
case PM_TRANS_EVT_ADD_START:
if(config->noprogressbar) {
- printf(_("installing %s... "), alpm_pkg_get_name(data1));
+ printf(_("installing %s...\n"), alpm_pkg_get_name(data1));
}
break;
case PM_TRANS_EVT_ADD_DONE:
- if(config->noprogressbar) {
- printf(_("done.\n"));
- }
snprintf(str, LOG_STR_LEN, "installed %s (%s)\n",
alpm_pkg_get_name(data1),
alpm_pkg_get_version(data1));
@@ -197,13 +186,10 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
break;
case PM_TRANS_EVT_REMOVE_START:
if(config->noprogressbar) {
- printf(_("removing %s... "), alpm_pkg_get_name(data1));
+ printf(_("removing %s...\n"), alpm_pkg_get_name(data1));
}
break;
case PM_TRANS_EVT_REMOVE_DONE:
- if(config->noprogressbar) {
- printf(_("done.\n"));
- }
snprintf(str, LOG_STR_LEN, "removed %s (%s)\n",
alpm_pkg_get_name(data1),
alpm_pkg_get_version(data1));
@@ -211,13 +197,10 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
break;
case PM_TRANS_EVT_UPGRADE_START:
if(config->noprogressbar) {
- printf(_("upgrading %s... "), alpm_pkg_get_name(data1));
+ printf(_("upgrading %s...\n"), alpm_pkg_get_name(data1));
}
break;
case PM_TRANS_EVT_UPGRADE_DONE:
- if(config->noprogressbar) {
- printf(_("done.\n"));
- }
snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)\n",
(char *)alpm_pkg_get_name(data1),
(char *)alpm_pkg_get_version(data2),
@@ -225,20 +208,20 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
alpm_logaction(str);
break;
case PM_TRANS_EVT_INTEGRITY_START:
- printf(_("checking package integrity... "));
+ printf(_("checking package integrity...\n"));
break;
case PM_TRANS_EVT_DELTA_INTEGRITY_START:
- printf(_("checking delta integrity... "));
+ printf(_("checking delta integrity...\n"));
break;
case PM_TRANS_EVT_DELTA_PATCHES_START:
printf(_("applying deltas...\n"));
break;
- case PM_TRANS_EVT_DELTA_PATCHES_DONE:
- /* nothing */
- break;
case PM_TRANS_EVT_DELTA_PATCH_START:
printf(_("generating %s with %s... "), (char *)data1, (char *)data2);
break;
+ case PM_TRANS_EVT_DELTA_PATCH_DONE:
+ printf(_("success!\n"));
+ break;
case PM_TRANS_EVT_DELTA_PATCH_FAILED:
printf(_("failed.\n"));
break;
@@ -252,13 +235,15 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
printf(_(":: Retrieving packages from %s...\n"), (char*)data1);
break;
/* all the simple done events, with fallthrough for each */
+ case PM_TRANS_EVT_FILECONFLICTS_DONE:
+ case PM_TRANS_EVT_EXTRACT_DONE:
case PM_TRANS_EVT_CHECKDEPS_DONE:
case PM_TRANS_EVT_RESOLVEDEPS_DONE:
case PM_TRANS_EVT_INTERCONFLICTS_DONE:
case PM_TRANS_EVT_INTEGRITY_DONE:
case PM_TRANS_EVT_DELTA_INTEGRITY_DONE:
- case PM_TRANS_EVT_DELTA_PATCH_DONE:
- printf(_("done.\n"));
+ case PM_TRANS_EVT_DELTA_PATCHES_DONE:
+ /* nothing */
break;
}
fflush(stdout);
--
cgit v1.2.3-70-g09d2