From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 4 Aug 2009 19:20:34 +0000 (-0000)
Subject: Bug #280269 - Fix StaticFileSet.multiBuilder() to handle unicode filenames.
X-Git-Tag: v2.2_rc36~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=db484dfe75fa0169a6a7e42d35827a63ee2fdd20;p=portage.git

Bug #280269 - Fix StaticFileSet.multiBuilder() to handle unicode filenames.

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

diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index aa4d6aac9..f4ecbae7c 100644
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -132,6 +132,9 @@ class StaticFileSet(EditablePackageSet):
 					if d[:1] == '.':
 						dirs.remove(d)
 				for filename in files:
+					if not isinstance(filename, unicode):
+						filename = unicode(filename,
+							encoding='utf_8', errors='replace')
 					if filename[:1] == '.':
 						continue
 					if filename.endswith(".metadata"):