summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 06:15:03 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 06:15:03 +0000
commit87b4012df99d0107e078d552a3883a94384bf7c1 (patch)
tree9611a4003ac0317fc8b1f8e92a6b0165e4597d81 /pym
parent96169f51cdaf2e3fef7209609689e26f1334a0d4 (diff)
downloadportage-87b4012df99d0107e078d552a3883a94384bf7c1.tar.gz
portage-87b4012df99d0107e078d552a3883a94384bf7c1.tar.bz2
portage-87b4012df99d0107e078d552a3883a94384bf7c1.zip
Fix default_encoding logic in _ensure_default_encoding(). (trunk r12695)
svn path=/main/branches/2.1.6/; revision=12952
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 88a520372..8775b87aa 100644
--- 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().