moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

Remove "done" messages from frontend callback function

Browse Source 
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>
This commit is contained in:
Dan McGee 2007-12-02 13:48:49 -06:00
parent aa2d0d7114
commit 3017b71cb5
1 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/pacman/callback.c
View File

@ -160,36 +160,25 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
switch(event) { switch(event) {
case PM_TRANS_EVT_CHECKDEPS_START: case PM_TRANS_EVT_CHECKDEPS_START:
printf(_("checking dependencies... ")); printf(_("checking dependencies...\n"));
break; break;
case PM_TRANS_EVT_FILECONFLICTS_START: case PM_TRANS_EVT_FILECONFLICTS_START:
if(config->noprogressbar) { if(config->noprogressbar) {
printf(_("checking for file conflicts... ")); printf(_("checking for file conflicts...\n"));
} }
break; break;
case PM_TRANS_EVT_RESOLVEDEPS_START: case PM_TRANS_EVT_RESOLVEDEPS_START:
printf(_("resolving dependencies... ")); printf(_("resolving dependencies...\n"));
break; break;
case PM_TRANS_EVT_INTERCONFLICTS_START: case PM_TRANS_EVT_INTERCONFLICTS_START:
printf(_("looking for inter-conflicts... ")); printf(_("looking for inter-conflicts...\n"));
break;
case PM_TRANS_EVT_FILECONFLICTS_DONE:
if(config->noprogressbar) {
printf(_("done.\n"));
}
break;
case PM_TRANS_EVT_EXTRACT_DONE:
/* nothing */
break; break;
case PM_TRANS_EVT_ADD_START: case PM_TRANS_EVT_ADD_START:
if(config->noprogressbar) { if(config->noprogressbar) {
printf(_("installing %s... "), alpm_pkg_get_name(data1)); printf(_("installing %s...\n"), alpm_pkg_get_name(data1));
} }
break; break;
case PM_TRANS_EVT_ADD_DONE: case PM_TRANS_EVT_ADD_DONE:
if(config->noprogressbar) {
printf(_("done.\n"));
}
snprintf(str, LOG_STR_LEN, "installed %s (%s)\n", snprintf(str, LOG_STR_LEN, "installed %s (%s)\n",
alpm_pkg_get_name(data1), alpm_pkg_get_name(data1),
alpm_pkg_get_version(data1)); alpm_pkg_get_version(data1));
@ -197,13 +186,10 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
break; break;
case PM_TRANS_EVT_REMOVE_START: case PM_TRANS_EVT_REMOVE_START:
if(config->noprogressbar) { if(config->noprogressbar) {
printf(_("removing %s... "), alpm_pkg_get_name(data1)); printf(_("removing %s...\n"), alpm_pkg_get_name(data1));
} }
break; break;
case PM_TRANS_EVT_REMOVE_DONE: case PM_TRANS_EVT_REMOVE_DONE:
if(config->noprogressbar) {
printf(_("done.\n"));
}
snprintf(str, LOG_STR_LEN, "removed %s (%s)\n", snprintf(str, LOG_STR_LEN, "removed %s (%s)\n",
alpm_pkg_get_name(data1), alpm_pkg_get_name(data1),
alpm_pkg_get_version(data1)); alpm_pkg_get_version(data1));
@ -211,13 +197,10 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
break; break;
case PM_TRANS_EVT_UPGRADE_START: case PM_TRANS_EVT_UPGRADE_START:
if(config->noprogressbar) { if(config->noprogressbar) {
printf(_("upgrading %s... "), alpm_pkg_get_name(data1)); printf(_("upgrading %s...\n"), alpm_pkg_get_name(data1));
} }
break; break;
case PM_TRANS_EVT_UPGRADE_DONE: case PM_TRANS_EVT_UPGRADE_DONE:
if(config->noprogressbar) {
printf(_("done.\n"));
}
snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)\n", snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)\n",
(char *)alpm_pkg_get_name(data1), (char *)alpm_pkg_get_name(data1),
(char *)alpm_pkg_get_version(data2), (char *)alpm_pkg_get_version(data2),
@ -225,20 +208,20 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
alpm_logaction(str); alpm_logaction(str);
break; break;
case PM_TRANS_EVT_INTEGRITY_START: case PM_TRANS_EVT_INTEGRITY_START:
printf(_("checking package integrity... ")); printf(_("checking package integrity...\n"));
break; break;
case PM_TRANS_EVT_DELTA_INTEGRITY_START: case PM_TRANS_EVT_DELTA_INTEGRITY_START:
printf(_("checking delta integrity... ")); printf(_("checking delta integrity...\n"));
break; break;
case PM_TRANS_EVT_DELTA_PATCHES_START: case PM_TRANS_EVT_DELTA_PATCHES_START:
printf(_("applying deltas...\n")); printf(_("applying deltas...\n"));
break; break;
case PM_TRANS_EVT_DELTA_PATCHES_DONE:
/* nothing */
break;
case PM_TRANS_EVT_DELTA_PATCH_START: case PM_TRANS_EVT_DELTA_PATCH_START:
printf(_("generating %s with %s... "), (char *)data1, (char *)data2); printf(_("generating %s with %s... "), (char *)data1, (char *)data2);
break; break;
case PM_TRANS_EVT_DELTA_PATCH_DONE:
printf(_("success!\n"));
break;
case PM_TRANS_EVT_DELTA_PATCH_FAILED: case PM_TRANS_EVT_DELTA_PATCH_FAILED:
printf(_("failed.\n")); printf(_("failed.\n"));
break; break;
@ -252,13 +235,15 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
printf(_(":: Retrieving packages from %s...\n"), (char*)data1); printf(_(":: Retrieving packages from %s...\n"), (char*)data1);
break; break;
/* all the simple done events, with fallthrough for each */ /* 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_CHECKDEPS_DONE:
case PM_TRANS_EVT_RESOLVEDEPS_DONE: case PM_TRANS_EVT_RESOLVEDEPS_DONE:
case PM_TRANS_EVT_INTERCONFLICTS_DONE: case PM_TRANS_EVT_INTERCONFLICTS_DONE:
case PM_TRANS_EVT_INTEGRITY_DONE: case PM_TRANS_EVT_INTEGRITY_DONE:
case PM_TRANS_EVT_DELTA_INTEGRITY_DONE: case PM_TRANS_EVT_DELTA_INTEGRITY_DONE:
case PM_TRANS_EVT_DELTA_PATCH_DONE: case PM_TRANS_EVT_DELTA_PATCHES_DONE:
printf(_("done.\n")); /* nothing */
break; break;
} }
fflush(stdout); fflush(stdout);