saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix issue#49150 hosts.rm_host changes /etc/hosts with odd characters

Browse source
This commit is contained in:
sunyanqun 2018-08-29 17:04:13 +08:00
parent 2cf2e62265
commit 76ba5b6d00
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/modules/hosts.py
View file

@ -212,19 +212,21 @@ def rm_host(ip, alias):
continue
if tmpline.startswith(b'#'):
continue
comps = salt.utils.stringutils.to_unicode(tmpline).split()
if comps[0] == ip:
newline = '{0}\t\t'.format(comps[0])
comps = tmpline.split()
b_ip = salt.utils.stringutils.to_bytes(ip)
b_alias = salt.utils.stringutils.to_bytes(alias)
if comps[0] == b_ip:
newline = comps[0] + b'\t\t'
for existing in comps[1:]:
if existing == alias:
if existing == b_alias:
continue
newline += ' {0}'.format(existing)
if newline.strip() == ip:
newline += existing + b' '
if newline.strip() == b_ip:
# No aliases exist for the line, make it empty
lines[ind] = b''
else:
# Only an alias was removed
lines[ind] = newline + os.linesep
lines[ind] = newline + salt.utils.stringutils.to_bytes(os.linesep)
with salt.utils.files.fopen(hfn, 'wb') as ofile:
ofile.writelines(lines)
return True