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

colourize -Ss/-Qs 

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-06 12:08:07 -05:00 committed by Allan McRae
parent 46c10c5bf3
commit 326345b378
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pacman/package.c
View File

@ -352,10 +352,12 @@ void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg)
alpm_pkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname);
if(lpkg) {
const char *lpkgver = alpm_pkg_get_version(lpkg);
const colstr_t *colstr = &config->colstr;
if(strcmp(lpkgver, pkgver) == 0) {
printf(" [%s]", _("installed"));
printf(" %s[%s]%s", colstr->meta, _("installed"), colstr->nocolor);
} else {
printf(" [%s: %s]", _("installed"), lpkgver);
printf(" %s[%s: %s]%s", colstr->meta, _("installed"),
lpkgver, colstr->nocolor);
}
}
}
@ -372,6 +374,7 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status)
alpm_db_t *db_local;
alpm_list_t *i, *searchlist;
unsigned short cols;
const colstr_t *colstr = &config->colstr;
if(show_status) {
db_local = alpm_get_localdb(config->handle);
@ -397,12 +400,13 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status)
if(config->quiet) {
fputs(alpm_pkg_get_name(pkg), stdout);
} else {
printf("%s/%s %s", alpm_db_get_name(db),
alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(db),
colstr->title, alpm_pkg_get_name(pkg),
colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor);
if((grp = alpm_pkg_get_groups(pkg)) != NULL) {
alpm_list_t *k;
fputs(" (", stdout);
printf(" %s(", colstr->groups);
for(k = grp; k; k = alpm_list_next(k)) {
const char *group = k->data;
fputs(group, stdout);
@ -411,7 +415,7 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status)
putchar(' ');
}
}
putchar(')');
printf(")%s", colstr->nocolor);
}
if(show_status) {