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

git ssh wrapper: py3-compatability with strings

Browse source 
Wrap the fh.write(str) in b() to ensure the string is of the proper type in py2/py3. Otherwise, the following error occurs when using its ssh_wrapper:

    An exception occurred during task execution. The full traceback is:
    Traceback (most recent call last):
      File "/tmp/ansible_8r299r6t/ansible_module_git.py", line 1049, in <module>
        main()
      File "/tmp/ansible_8r299r6t/ansible_module_git.py", line 928, in main
        ssh_wrapper = write_ssh_wrapper()
      File "/tmp/ansible_8r299r6t/ansible_module_git.py", line 330, in write_ssh_wrapper
        fh.write(template)
    TypeError: 'str' does not support the buffer interface
This commit is contained in:
tedder 2016-12-28 08:21:51 -06:00 committed by Toshio Kuratomi
parent 4937dd67e4
commit 15e12d2cf2
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/modules/source_control/git.py
View file

@ -314,7 +314,7 @@ def write_ssh_wrapper():
except (IOError, OSError): except (IOError, OSError):
fd, wrapper_path = tempfile.mkstemp() fd, wrapper_path = tempfile.mkstemp()
fh = os.fdopen(fd, 'w+b') fh = os.fdopen(fd, 'w+b')
template = """#!/bin/sh template = b("""#!/bin/sh
if [ -z "$GIT_SSH_OPTS" ]; then if [ -z "$GIT_SSH_OPTS" ]; then
BASEOPTS="" BASEOPTS=""
else else
@ -326,7 +326,7 @@ if [ -z "$GIT_KEY" ]; then
else else
ssh -i "$GIT_KEY" -o IdentitiesOnly=yes $BASEOPTS "$@" ssh -i "$GIT_KEY" -o IdentitiesOnly=yes $BASEOPTS "$@"
fi fi
""" """)
fh.write(template) fh.write(template)
fh.close() fh.close()
st = os.stat(wrapper_path) st = os.stat(wrapper_path)