Fix default_encoding logic in _ensure_default_encoding(). (trunk r12695)

svn path=/main/branches/2.1.6/; revision=12952

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 88a520372225ee5548b190871e3b351e1694c522..8775b87aac78b1a122e9e2fca651d948ab3e9430 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7545,7 +7545,8 @@ def _ensure_default_encoding():
 
        encodings = _gen_missing_encodings(missing_encodings)
 
-       if default_encoding not in encodings:
+       if default_encoding in missing_encodings and \
+               default_encoding not in encodings:
                # Make the fallback codec correspond to whatever name happens
                # to be returned by sys.getdefaultencoding().