From 3a5f7f4993134022c094cb9247f9486061732b99 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 22 Mar 2012 10:15:10 -0700 Subject: emerge --changelog: fix split ChangeLog bugs This should fix possible missing content when displaying split ChangeLogs (bug #389611), and also normalizes blank lines. --- pym/_emerge/resolver/output.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pym/_emerge/resolver/output.py') diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index bec6619a1..a97658afb 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -16,7 +16,7 @@ from portage.dbapi.dep_expand import dep_expand from portage.dep import cpvequal, _repo_separator from portage.exception import InvalidDependString, SignatureException from portage.package.ebuild._spawn_nofetch import spawn_nofetch -from portage.output import ( blue, bold, colorize, create_color_func, +from portage.output import ( blue, colorize, create_color_func, darkblue, darkgreen, green, nc_len, red, teal, turquoise, yellow ) bad = create_color_func("BAD") from portage.util import writemsg_stdout @@ -598,13 +598,9 @@ class Display(object): def print_changelog(self): """Prints the changelog text to std_out """ - if not self.changelogs: - return - writemsg_stdout('\n', noiselevel=-1) - for revision, text in self.changelogs: - writemsg_stdout(bold('*'+revision) + '\n' + text, + for chunk in self.changelogs: + writemsg_stdout(chunk, noiselevel=-1) - return def get_display_list(self, mylist): -- cgit v1.2.3-1-g7c22