From c7df44e774a0c1400b4c91123146fa4396644f91 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 6 Aug 2009 05:35:14 +0000 Subject: Do not pass unicode strings into os.walk calls, since it can cause internal os.path.join calls to raise UnicodeDecodeError. svn path=/main/trunk/; revision=13926 --- pym/portage/env/loaders.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pym/portage/env') diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index 7b4d72721..854304125 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -39,6 +39,12 @@ def RecursiveFileLoader(filename): @rtype: list @returns: List of files to process """ + + if isinstance(filename, unicode): + # Avoid UnicodeDecodeError raised from + # os.path.join when called by os.walk. + filename = filename.encode('utf_8', 'replace') + try: st = os.stat(filename) except OSError: -- cgit v1.2.3-1-g7c22