summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/RepoDisplay.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-22 07:52:43 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-22 07:52:43 +0000
commit9832f811c7b731bfd2d965986cd5a058a9c6c92f (patch)
tree18b90a229d1858a019ca0555a2a9608b68591891 /pym/_emerge/RepoDisplay.py
parentb2136c384e68856cba89d1c571f408620e525210 (diff)
downloadportage-9832f811c7b731bfd2d965986cd5a058a9c6c92f.tar.gz
portage-9832f811c7b731bfd2d965986cd5a058a9c6c92f.tar.bz2
portage-9832f811c7b731bfd2d965986cd5a058a9c6c92f.zip
Bug #282269 - Avoid str() calls with overlay paths, which can trigger
UnicodeEncodeError in python-2.x. svn path=/main/trunk/; revision=14124
Diffstat (limited to 'pym/_emerge/RepoDisplay.py')
-rw-r--r--pym/_emerge/RepoDisplay.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/_emerge/RepoDisplay.py b/pym/_emerge/RepoDisplay.py
index a954aebfa..e98be93c4 100644
--- a/pym/_emerge/RepoDisplay.py
+++ b/pym/_emerge/RepoDisplay.py
@@ -48,6 +48,10 @@ class RepoDisplay(object):
return s
def __str__(self):
+ """
+ In python-2.x, str() can trigger a UnicodeEncodeError here,
+ so call __str__() directly.
+ """
output = []
shown_repos = self._shown_repos
unknown_repo = self._unknown_repo