diff options
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 17 |
1 files changed, 17 insertions, 0 deletions
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 |