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

remove :: prefix from all message 

This will substantially simplify the logic to add colours to messages.

Signed-off-by: Simon Gomizelj <simongmzlj@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Simon Gomizelj 2013-03-01 13:40:02 -05:00 committed by Allan McRae
parent 098cfe516d
commit ef5feb15a7
5 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pacman/callback.c
View File

@ -244,7 +244,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
fputs((const char *)data1, stdout); fputs((const char *)data1, stdout);
break; break;
case ALPM_EVENT_RETRIEVE_START: case ALPM_EVENT_RETRIEVE_START:
printf(_(":: Retrieving packages ...\n")); colon_printf(_("Retrieving packages ...\n"));
break; break;
case ALPM_EVENT_DISKSPACE_START: case ALPM_EVENT_DISKSPACE_START:
if(config->noprogressbar) { if(config->noprogressbar) {
@ -252,7 +252,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
} }
break; break;
case ALPM_EVENT_OPTDEP_REQUIRED: case ALPM_EVENT_OPTDEP_REQUIRED:
printf(_(":: %s optionally requires %s\n"), alpm_pkg_get_name(data1), colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1),
alpm_dep_compute_string(data2)); alpm_dep_compute_string(data2));
break; break;
case ALPM_EVENT_DATABASE_MISSING: case ALPM_EVENT_DATABASE_MISSING:
@ -290,14 +290,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
switch(event) { switch(event) {
case ALPM_QUESTION_INSTALL_IGNOREPKG: case ALPM_QUESTION_INSTALL_IGNOREPKG:
if(!config->op_s_downloadonly) { if(!config->op_s_downloadonly) {
*response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), *response = yesno(_("%s is in IgnorePkg/IgnoreGroup. Install anyway?"),
alpm_pkg_get_name(data1)); alpm_pkg_get_name(data1));
} else { } else {
*response = 1; *response = 1;
} }
break; break;
case ALPM_QUESTION_REPLACE_PKG: case ALPM_QUESTION_REPLACE_PKG:
*response = yesno(_(":: Replace %s with %s/%s?"), *response = yesno(_("Replace %s with %s/%s?"),
alpm_pkg_get_name(data1), alpm_pkg_get_name(data1),
(char *)data3, (char *)data3,
alpm_pkg_get_name(data2)); alpm_pkg_get_name(data2));
@ -306,12 +306,12 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
/* data parameters: target package, local package, conflict (strings) */ /* data parameters: target package, local package, conflict (strings) */
/* print conflict only if it contains new information */ /* print conflict only if it contains new information */
if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) { if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) {
*response = noyes(_(":: %s and %s are in conflict. Remove %s?"), *response = noyes(_("%s and %s are in conflict. Remove %s?"),
(char *)data1, (char *)data1,
(char *)data2, (char *)data2,
(char *)data2); (char *)data2);
} else { } else {
*response = noyes(_(":: %s and %s are in conflict (%s). Remove %s?"), *response = noyes(_("%s and %s are in conflict (%s). Remove %s?"),
(char *)data1, (char *)data1,
(char *)data2, (char *)data2,
(char *)data3, (char *)data3,
@ -328,9 +328,9 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
(char *)alpm_pkg_get_name(i->data)); (char *)alpm_pkg_get_name(i->data));
count++; count++;
} }
printf(_n( colon_printf(_n(
":: The following package cannot be upgraded due to unresolvable dependencies:\n", "The following package cannot be upgraded due to unresolvable dependencies:\n",
":: The following packages cannot be upgraded due to unresolvable dependencies:\n", "The following packages cannot be upgraded due to unresolvable dependencies:\n",
count)); count));
list_display(" ", namelist, getcols(fileno(stdout))); list_display(" ", namelist, getcols(fileno(stdout)));
printf("\n"); printf("\n");
@ -346,7 +346,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
alpm_list_t *providers = data1; alpm_list_t *providers = data1;
size_t count = alpm_list_count(providers); size_t count = alpm_list_count(providers);
char *depstring = alpm_dep_compute_string((alpm_depend_t *)data2); char *depstring = alpm_dep_compute_string((alpm_depend_t *)data2);
printf(_(":: There are %zd providers available for %s:\n"), count, colon_printf(_("There are %zd providers available for %s:\n"), count,
depstring); depstring);
free(depstring); free(depstring);
select_display(providers); select_display(providers);
@ -355,7 +355,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
break; break;
case ALPM_QUESTION_LOCAL_NEWER: case ALPM_QUESTION_LOCAL_NEWER:
if(!config->op_s_downloadonly) { if(!config->op_s_downloadonly) {
*response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), *response = yesno(_("%s-%s: local version is newer. Upgrade anyway?"),
alpm_pkg_get_name(data1), alpm_pkg_get_name(data1),
alpm_pkg_get_version(data1)); alpm_pkg_get_version(data1));
} else { } else {
@ -363,7 +363,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
} }
break; break;
case ALPM_QUESTION_CORRUPTED_PKG: case ALPM_QUESTION_CORRUPTED_PKG:
*response = yesno(_(":: File %s is corrupted (%s).\n" *response = yesno(_("File %s is corrupted (%s).\n"
"Do you want to delete it?"), "Do you want to delete it?"),
(char *)data1, (char *)data1,
alpm_strerror(*(alpm_errno_t *)data2)); alpm_strerror(*(alpm_errno_t *)data2));
@ -380,7 +380,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
revoked = " (revoked)"; revoked = " (revoked)";
} }
*response = yesno(_(":: Import PGP key %d%c/%s, \"%s\", created: %s%s?"), *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s%s?"),
key->length, key->pubkey_algo, key->fingerprint, key->uid, created, revoked); key->length, key->pubkey_algo, key->fingerprint, key->uid, created, revoked);
} }
break; break;

2
src/pacman/remove.c
View File

@ -119,7 +119,7 @@ int pacman_remove(alpm_list_t *targets)
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
alpm_depmissing_t *miss = i->data; alpm_depmissing_t *miss = i->data;
char *depstring = alpm_dep_compute_string(miss->depend); char *depstring = alpm_dep_compute_string(miss->depend);
printf(_(":: %s: requires %s\n"), miss->target, depstring); colon_printf(_("%s: requires %s\n"), miss->target, depstring);
free(depstring); free(depstring);
} }
break; break;

14
src/pacman/sync.c
View File

@ -592,7 +592,7 @@ static int process_group(alpm_list_t *dbs, const char *group, int error)
} }
if(config->print == 0) { if(config->print == 0) {
printf(_(":: There are %d members in group %s:\n"), count, colon_printf(_("There are %d members in group %s:\n"), count,
group); group);
select_display(pkgs); select_display(pkgs);
char *array = malloc(count); char *array = malloc(count);
@ -717,7 +717,7 @@ static int sync_trans(alpm_list_t *targets)
} }
if(config->op_s_upgrade) { if(config->op_s_upgrade) {
printf(_(":: Starting full system upgrade...\n")); colon_printf(_("Starting full system upgrade...\n"));
alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, alpm_logaction(config->handle, PACMAN_CALLER_PREFIX,
"starting full system upgrade\n"); "starting full system upgrade\n");
if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) { if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) {
@ -744,14 +744,14 @@ int sync_prepare_execute(void)
case ALPM_ERR_PKG_INVALID_ARCH: case ALPM_ERR_PKG_INVALID_ARCH:
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
const char *pkg = i->data; const char *pkg = i->data;
printf(_(":: package %s does not have a valid architecture\n"), pkg); colon_printf(_("package %s does not have a valid architecture\n"), pkg);
} }
break; break;
case ALPM_ERR_UNSATISFIED_DEPS: case ALPM_ERR_UNSATISFIED_DEPS:
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
alpm_depmissing_t *miss = i->data; alpm_depmissing_t *miss = i->data;
char *depstring = alpm_dep_compute_string(miss->depend); char *depstring = alpm_dep_compute_string(miss->depend);
printf(_(":: %s: requires %s\n"), miss->target, depstring); colon_printf(_("%s: requires %s\n"), miss->target, depstring);
free(depstring); free(depstring);
} }
break; break;
@ -760,11 +760,11 @@ int sync_prepare_execute(void)
alpm_conflict_t *conflict = i->data; alpm_conflict_t *conflict = i->data;
/* only print reason if it contains new information */ /* only print reason if it contains new information */
if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { if(conflict->reason->mod == ALPM_DEP_MOD_ANY) {
printf(_(":: %s and %s are in conflict\n"), colon_printf(_("%s and %s are in conflict\n"),
conflict->package1, conflict->package2); conflict->package1, conflict->package2);
} else { } else {
char *reason = alpm_dep_compute_string(conflict->reason); char *reason = alpm_dep_compute_string(conflict->reason);
printf(_(":: %s and %s are in conflict (%s)\n"), colon_printf(_("%s and %s are in conflict (%s)\n"),
conflict->package1, conflict->package2, reason); conflict->package1, conflict->package2, reason);
free(reason); free(reason);
} }
@ -889,7 +889,7 @@ int pacman_sync(alpm_list_t *targets)
if(config->op_s_sync) { if(config->op_s_sync) {
/* grab a fresh package list */ /* grab a fresh package list */
printf(_(":: Synchronizing package databases...\n")); colon_printf(_("Synchronizing package databases...\n"));
alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, alpm_logaction(config->handle, PACMAN_CALLER_PREFIX,
"synchronizing package lists\n"); "synchronizing package lists\n");
if(!sync_synctree(config->op_s_sync, sync_dbs)) { if(!sync_synctree(config->op_s_sync, sync_dbs)) {

17
src/pacman/util.c
View File

@ -1219,8 +1219,7 @@ static void display_repo_list(const char *dbname, alpm_list_t *list,
{ {
const char *prefix = " "; const char *prefix = " ";
printf(":: "); colon_printf(_("Repository %s\n"), dbname);
printf(_("Repository %s\n"), dbname);
list_display(prefix, list, cols); list_display(prefix, list, cols);
} }
@ -1461,6 +1460,7 @@ static int question(short preset, char *fmt, va_list args)
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
fprintf(stream, ":: ");
vfprintf(stream, fmt, args); vfprintf(stream, fmt, args);
if(preset) { if(preset) {
@ -1522,6 +1522,19 @@ int noyes(char *fmt, ...)
return ret; return ret;
} }
int colon_printf(const char *fmt, ...)
{
int ret;
va_list args;
fputs(":: ", stdout);
va_start(args, fmt);
ret = vprintf(fmt, args);
va_end(args);
return ret;
}
int pm_printf(alpm_loglevel_t level, const char *format, ...) int pm_printf(alpm_loglevel_t level, const char *format, ...)
{ {
int ret; int ret;

1
src/pacman/util.h
View File

@ -72,6 +72,7 @@ void print_packages(const alpm_list_t *packages);
void select_display(const alpm_list_t *pkglist); void select_display(const alpm_list_t *pkglist);
int select_question(int count); int select_question(int count);
int multiselect_question(char *array, int count); int multiselect_question(char *array, int count);
int colon_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
int yesno(char *fmt, ...) __attribute__((format(printf, 1, 2))); int yesno(char *fmt, ...) __attribute__((format(printf, 1, 2)));
int noyes(char *fmt, ...) __attribute__((format(printf, 1, 2))); int noyes(char *fmt, ...) __attribute__((format(printf, 1, 2)));