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

\r does not round-trip the local socket, escape and restore on the other side (#43507)

Browse source
This commit is contained in:
Nathaniel Case 2018-08-01 08:44:39 -04:00 committed by GitHub
parent c4591f0861
commit 9169daa326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible-connection
View file

@ -214,6 +214,8 @@ def main():
raise Exception("EOF found before vars data was complete") raise Exception("EOF found before vars data was complete")
vars_data += cur_line vars_data += cur_line
cur_line = stdin.readline() cur_line = stdin.readline()
# restore escaped loose \r characters
vars_data = vars_data.replace(br'\r', b'\r')
if PY3: if PY3:
pc_data = cPickle.loads(init_data, encoding='bytes') pc_data = cPickle.loads(init_data, encoding='bytes')

2
lib/ansible/executor/task_executor.py
View file

@ -936,6 +936,8 @@ class TaskExecutor:
stdin.write(b'\n#END_INIT#\n') stdin.write(b'\n#END_INIT#\n')
src = cPickle.dumps(variables, protocol=0) src = cPickle.dumps(variables, protocol=0)
# remaining \r fail to round-trip the socket
src = src.replace(b'\r', br'\r')
stdin.write(src) stdin.write(src)
stdin.write(b'\n#END_VARS#\n') stdin.write(b'\n#END_VARS#\n')