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

Turn off colours once finished using them 

The colour of the package version could leak onto the next line in both
-Qo and -Fo.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2016-06-04 17:00:48 +10:00
parent 839417e8c6
commit 7a9d8b7001
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pacman/files.c
View File

@ -78,10 +78,10 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) {
print_line_machinereadable(repo, pkg, filename);
} else if(!config->quiet) {
const colstr_t *colstr = &config->colstr;
printf(_("%s is owned by %s%s/%s%s %s%s\n"), filename,
printf(_("%s is owned by %s%s/%s%s %s%s%s\n"), filename,
colstr->repo, alpm_db_get_name(repo), colstr->title,
alpm_pkg_get_name(pkg), colstr->version,
alpm_pkg_get_version(pkg));
alpm_pkg_get_version(pkg), colstr->nocolor);
} else {
printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg));
}

5
src/pacman/query.c
View File

@ -84,8 +84,9 @@ static void print_query_fileowner(const char *filename, alpm_pkg_t *info)
{
if(!config->quiet) {
const colstr_t *colstr = &config->colstr;
printf(_("%s is owned by %s%s %s%s\n"), filename, colstr->title,
alpm_pkg_get_name(info), colstr->version, alpm_pkg_get_version(info));
printf(_("%s is owned by %s%s %s%s%s\n"), filename, colstr->title,
alpm_pkg_get_name(info), colstr->version, alpm_pkg_get_version(info),
colstr->nocolor);
} else {
printf("%s\n", alpm_pkg_get_name(info));
}