Fix default_encoding logic in _ensure_default_encoding().

svn path=/main/trunk/; revision=12695

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 990da479ccb2a202e2c6ddac3f1ccf3c682ff420..9f0982b0c9b692cb010773ed7d8cf633c55459ea 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7558,7 +7558,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().