From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 23 Aug 2009 07:40:57 +0000 (-0000)
Subject: Bug #282306 - Inside LinkageMap._ObjectKey._generate_object_key(), fall back
X-Git-Tag: v2.2_rc40~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fee6105d465c00a303a6dfb713fd5d008d6be79f;p=portage.git

Bug #282306 - Inside LinkageMap._ObjectKey._generate_object_key(), fall back
to utf_8 encoding if a path cannot be encoded under the user's chosen
encoding. This should complete the fix for the traceback shown in bug #282115,
comment #6.

svn path=/main/trunk/; revision=14131
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e6ed16498..5a2c3d091 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -249,6 +249,21 @@ class LinkageMap(object):
 
 			os = _os_merge
 
+			try:
+				_unicode_encode(obj,
+					encoding=_encodings['merge'], errors='strict')
+			except UnicodeEncodeError:
+				# The package appears to have been merged with a 
+				# different value of sys.getfilesystemencoding(),
+				# so fall back to utf_8 if appropriate.
+				try:
+					_unicode_encode(obj,
+						encoding=_encodings['fs'], errors='strict')
+				except UnicodeEncodeError:
+					pass
+				else:
+					os = portage.os
+
 			abs_path = os.path.join(root, obj.lstrip(os.sep))
 			try:
 				object_stat = os.stat(abs_path)