From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Feb 2009 16:41:49 +0000 (-0000)
Subject: Fix default_encoding logic in _ensure_default_encoding().
X-Git-Tag: v2.2_rc24~118
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a27654f6567e1b15368a19e1953b7c3cb863927d;p=portage.git

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 990da479c..9f0982b0c 100644
--- 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().