sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.client] handle correctly encoded file paths too.

Browse Source 
Historically, Portage + Py2 were not dealing well with file paths that
were containing non-ascii chars. The situation has apparently improved
and we are able to accept paths with the correct encoding in Entropy
(separate patch will come). We need to guard against broken paths anyway,
so let's try to check which one of the paths is the one that has the
most chance to be the right one. Also, with python3 this won't be
a problem anymore...
This commit is contained in:
Fabio Erculiani
2018-09-23 21:01:26 +02:00
parent c753f215d6
commit 34c549feb8
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/entropy/client/interfaces/package/actions/_manage.py
View File

@@ -465,10 +465,25 @@ class _PackageInstallRemoveAction(PackageAction):
sys_root_item = sys_root + item
sys_root_item_encoded = sys_root_item
if not const_is_python3():
# this is coming from the db, and it's pure utf-8
sys_root_item_encoded = const_convert_to_rawstring(
# this is coming from the db, and it's pure utf-8.
# sometimes we need to deal with broken filesystem
# or path encodings, so we should try both paths, really.
proposed_sys_root_item_encoded = const_convert_to_rawstring(
sys_root_item,
from_enctype = etpConst['conf_raw_encoding'])
proposed_lexists = os.path.lexists(proposed_sys_root_item_encoded)
old_lexists = os.path.lexists(sys_root_item_encoded)
if proposed_lexists and not old_lexists:
sys_root_item_encoded = proposed_sys_root_item_encoded
elif not proposed_lexists and old_lexists:
# The rawstring version of the path does not exist, while the
# original version does.
# Do not replace sys_root_item_encoded then.
self._entropy.logger.log(
"[Package]",
etpConst['logging']['verbose_loglevel_id'],
"[remove] Package %s contains hostile unicode file paths." % (
remove_atom,))
# collision check
if col_protect > 0: