From c426d6d944605f2463b8cfa6ce1fb2968b43e460 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 14 Sep 2010 23:32:43 -0700 Subject: In Package._validate_deps(), force unicode format string in check_required_use() exception handling (for python-2.x safety). --- pym/_emerge/Package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/Package.py') 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) -- cgit v1.2.3-1-g7c22