From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 06:15:03 +0000 (-0000)
Subject: Fix default_encoding logic in _ensure_default_encoding(). (trunk r12695)
X-Git-Tag: v2.1.6.8~125
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87b4012df99d0107e078d552a3883a94384bf7c1;p=portage.git

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 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().