depgraph: handle unicode exception for bug 384749

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 00d962822e2034c9248878ced0ff195589fe5a05..f9f49545b0d3eee582d7cd2537b61b69a6f21d8c 100644 (file)
--- 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]