summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-09-27 22:26:27 -0700
committerZac Medico <zmedico@gentoo.org>2011-09-27 22:26:27 -0700
commit28ce242ff1bf55605227b1877aaba0b76388714c (patch)
treef1390e6b9cfbd66bac91e62088f8e96c82dbf2cb
parent60c7ca4030839a728a5975ee01e28c0330cf33ae (diff)
downloadportage-28ce242ff1bf55605227b1877aaba0b76388714c.tar.gz
portage-28ce242ff1bf55605227b1877aaba0b76388714c.tar.bz2
portage-28ce242ff1bf55605227b1877aaba0b76388714c.zip
depgraph: handle unicode exception for bug 384749
-rw-r--r--pym/_emerge/depgraph.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 00d962822..f9f49545b 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4480,7 +4480,7 @@ class depgraph(object):
# matches (this can happen if an atom lacks a
# category).
show_invalid_depstring_notice(
- pkg, depstr, str(e))
+ pkg, depstr, _unicode_decode("%s") % (e,))
del e
raise
if not success:
@@ -4511,7 +4511,8 @@ class depgraph(object):
except portage.exception.InvalidAtom as e:
depstr = " ".join(vardb.aux_get(pkg.cpv, dep_keys))
show_invalid_depstring_notice(
- pkg, depstr, "Invalid Atom: %s" % (e,))
+ pkg, depstr,
+ _unicode_decode("Invalid Atom: %s") % (e,))
return False
for cpv in stale_cache:
del blocker_cache[cpv]