mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 13:52:54 +00:00
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:
committed by
ansibot
parent
94296908d7
commit
c16d258a27
@@ -30,7 +30,7 @@ except ImportError:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
from ansible.plugins.lookup import LookupBase
|
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:
|
try:
|
||||||
from __main__ import display
|
from __main__ import display
|
||||||
@@ -87,7 +87,7 @@ def file_props(root, path):
|
|||||||
except KeyError:
|
except KeyError:
|
||||||
ret['owner'] = st.st_uid
|
ret['owner'] = st.st_uid
|
||||||
try:
|
try:
|
||||||
ret['group'] = grp.getgrgid(st.st_gid).gr_name
|
ret['group'] = to_text(grp.getgrgid(st.st_gid).gr_name)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
ret['group'] = st.st_gid
|
ret['group'] = st.st_gid
|
||||||
ret['mode'] = '0%03o' % (stat.S_IMODE(st.st_mode))
|
ret['mode'] = '0%03o' % (stat.S_IMODE(st.st_mode))
|
||||||
|
|||||||
Reference in New Issue
Block a user