diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-30 12:19:13 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-30 12:19:13 -0800 |
| commit | 4deaa35787bfc52ec937f7ba9714706d9ac20da2 (patch) | |
| tree | 0277d1ea19a036d2d3594d4a45c96e1a51e45607 | |
| parent | 45fcca125bcfdbd3f1519ab9f9b8be2335ab079c (diff) | |
| download | portage-4deaa35787bfc52ec937f7ba9714706d9ac20da2.tar.gz portage-4deaa35787bfc52ec937f7ba9714706d9ac20da2.tar.bz2 portage-4deaa35787bfc52ec937f7ba9714706d9ac20da2.zip | |
vardbapi: unicode safe UnpicklingError message
Thanks to Fabio Erculiani <lxnay@gentoo.org> for reporting a
UnicodeDecodeError here.
| -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 fe3262655..e6e2de6a6 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -482,8 +482,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 \ |