diff options
| author | Allan McRae <allan@archlinux.org> | 2016-06-04 17:00:48 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-08-30 18:10:40 +1000 |
| commit | 7a9d8b7001f3f90471dc94ab31ec017f32ef8760 (patch) | |
| tree | fe48cc87c13d191c53d6af4dad245244e103e9bc | |
| parent | 839417e8c65e73e632c77d3ecd68539494850de1 (diff) | |
| download | pacman-7a9d8b7001f3f90471dc94ab31ec017f32ef8760.tar.xz | |
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>
| -rw-r--r-- | src/pacman/files.c | 4 | ||||
| -rw-r--r-- | src/pacman/query.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/pacman/files.c b/src/pacman/files.c index 692fcd56..f5cba5b2 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -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)); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 522212d3..a8f4e675 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -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)); } |