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

Bug #282306 - Inside dblink._find_libs_to_preserve(), fall back to utf_8
encoding if a path cannot be encoded under the user's chosen encoding. This
fixes the traceback shown in bug 282115, comment #6.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index aa74ed687..e6ed16498 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2717,6 +2717,23 @@ class dblink(object):
 		provider_nodes = set()
 		# Create provider nodes and add them to the graph.
 		for f_abs in old_contents:
+
+			if os is _os_merge:
+				try:
+					_unicode_encode(f_abs,
+						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(f_abs,
+							encoding=_encodings['fs'], errors='strict')
+					except UnicodeEncodeError:
+						pass
+					else:
+						os = portage.os
+
 			f = f_abs[root_len:]
 			if self.isowner(f, root):
 				continue