cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix encoding error on grp.gr_name, which can contain non-ascii chars at domain PCs (#25804)

Browse source 
* 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:
Sergey Scherbakov 2017-08-31 10:39:24 +03:00 committed by ansibot
parent 94296908d7
commit c16d258a27
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/lookup/filetree.py
View file

@ -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))