diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-09-14 23:32:43 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-14 23:32:43 -0700 |
| commit | c426d6d944605f2463b8cfa6ce1fb2968b43e460 (patch) | |
| tree | ba0c97850004e0056985d02f4c234f0d835e9378 /pym/_emerge/Package.py | |
| parent | Make Package._metadata_exception() use unicode format strings in order (diff) | |
| download | portage-c426d6d944605f2463b8cfa6ce1fb2968b43e460.tar.gz portage-c426d6d944605f2463b8cfa6ce1fb2968b43e460.tar.bz2 portage-c426d6d944605f2463b8cfa6ce1fb2968b43e460.zip | |
In Package._validate_deps(), force unicode format string in
check_required_use() exception handling (for python-2.x safety).
Diffstat (limited to 'pym/_emerge/Package.py')
| -rw-r--r-- | pym/_emerge/Package.py | 5 |
1 files changed, 4 insertions, 1 deletions
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) |