diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-30 12:19:13 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-03 22:27:39 -0800 |
| commit | b5aa445c81192171423179385231583782d1523f (patch) | |
| tree | 3fe64df353fef3179c77a2a159e9cba34669b125 /pym | |
| parent | 3fe5d7b8a219ade11593849597f60824fa739c36 (diff) | |
| download | portage-b5aa445c81192171423179385231583782d1523f.tar.gz portage-b5aa445c81192171423179385231583782d1523f.tar.bz2 portage-b5aa445c81192171423179385231583782d1523f.zip | |
vardbapi: unicode safe UnpicklingError message
Thanks to Fabio Erculiani <lxnay@gentoo.org> for reporting a
UnicodeDecodeError here.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 29e54ba69..d386880f4 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -481,8 +481,8 @@ class vardbapi(dbapi): del f except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError) as e: if isinstance(e, pickle.UnpicklingError): - writemsg(_("!!! Error loading '%s': %s\n") % \ - (self._aux_cache_filename, str(e)), noiselevel=-1) + writemsg(_unicode_decode(_("!!! Error loading '%s': %s\n")) % \ + (self._aux_cache_filename, e), noiselevel=-1) del e if not aux_cache or \ |