From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 28 Sep 2011 05:26:27 +0000 (-0700)
Subject: depgraph: handle unicode exception for bug 384749
X-Git-Tag: v2.2.0_alpha60~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28ce242ff1bf55605227b1877aaba0b76388714c;p=portage.git

depgraph: handle unicode exception for bug 384749
---

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]