From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 15 Sep 2010 06:32:43 +0000 (-0700)
Subject: In Package._validate_deps(), force unicode format string in
X-Git-Tag: v2.2_rc83~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c426d6d944605f2463b8cfa6ce1fb2968b43e460;p=portage.git

In Package._validate_deps(), force unicode format string in
check_required_use() exception handling (for python-2.x safety).
---

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 61a976530..0db16fb2f 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -125,8 +125,11 @@ class Package(Task):
 					check_required_use(v, (),
 						self.iuse.is_valid_flag)
 				except InvalidDependString as e:
+					# Force unicode format string for python-2.x safety,
+					# ensuring that PortageException.__unicode__() is used
+					# when necessary.
 					self._invalid_metadata(k + ".syntax",
-						"%s: %s" % (k, e))
+						_unicode_decode("%s: %s") % (k, e))
 
 		k = 'SRC_URI'
 		v = self.metadata.get(k)