Fix encoding error on grp.gr_name, which can contain non-ascii chars at domain PCs (#25804)
* Fix encoding errors on grp.gr_name, which can contain non-ascii character at LDAP/AD domain workstations * fix: utils.to_text() is now used instead of py3-incompatible unicode() method
This commit is contained in:
parent
94296908d7
commit
c16d258a27
1 changed files with 2 additions and 2 deletions
|
@ -30,7 +30,7 @@ except ImportError:
|
|||
pass
|
||||
|
||||
from ansible.plugins.lookup import LookupBase
|
||||
from ansible.module_utils._text import to_native
|
||||
from ansible.module_utils._text import to_native, to_text
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
@ -87,7 +87,7 @@ def file_props(root, path):
|
|||
except KeyError:
|
||||
ret['owner'] = st.st_uid
|
||||
try:
|
||||
ret['group'] = grp.getgrgid(st.st_gid).gr_name
|
||||
ret['group'] = to_text(grp.getgrgid(st.st_gid).gr_name)
|
||||
except KeyError:
|
||||
ret['group'] = st.st_gid
|
||||
ret['mode'] = '0%03o' % (stat.S_IMODE(st.st_mode))
|
||||
|
|
Loading…
Reference in a new issue