summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/env/loaders.py')
-rw-r--r--pym/portage/env/loaders.py6
1 files changed, 6 insertions, 0 deletions
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: