diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-05-06 12:40:56 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-05-06 12:40:56 -0700 |
| commit | 219934ec31061c6709d0ab8baff3e4a33d356c40 (patch) | |
| tree | 94cd844fb7362c74bb6dce0c41fd99a0641205c9 | |
| parent | 710cc824c3a4fd4317aa8999e45d5414fe08974a (diff) | |
| download | portage-219934ec31061c6709d0ab8baff3e4a33d356c40.tar.gz portage-219934ec31061c6709d0ab8baff3e4a33d356c40.tar.bz2 portage-219934ec31061c6709d0ab8baff3e4a33d356c40.zip | |
Bug #317775 - In depgraph.display() use writemsg_stdout() to avoid
UnicodeEncodeError.
| -rw-r--r-- | pym/_emerge/depgraph.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 79fa508a1..4978c99ee 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4682,12 +4682,11 @@ class depgraph(object): p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) p.append(colorize("WARN", " then resume the merge.")) - out = sys.stdout show_repos = repoadd_set and repoadd_set != set(["0"]) for x in p: if isinstance(x, basestring): - out.write("%s\n" % (x,)) + writemsg_stdout("%s\n" % (x,), noiselevel=-1) continue myprint, verboseadd, repoadd = x @@ -4698,14 +4697,13 @@ class depgraph(object): if show_repos and repoadd: myprint += " " + teal("[%s]" % repoadd) - out.write("%s\n" % (myprint,)) + writemsg_stdout("%s\n" % (myprint,), noiselevel=-1) for x in blockers: - print(x) + writemsg_stdout("%s\n" % (x,), noiselevel=-1) if verbosity == 3: - print() - print(counters) + writemsg_stdout('\n%s' % (counters,), noiselevel=-1) if show_repos: # In python-2.x, str() can trigger a UnicodeEncodeError here, # so call __str__() directly. @@ -4717,7 +4715,6 @@ class depgraph(object): writemsg_stdout(bold('*'+revision) + '\n' + text, noiselevel=-1) - sys.stdout.flush() return os.EX_OK def _tree_display(self, mylist): |