ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 11:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Revert "Make sudo+requiretty and ANSIBLE_PIPELINING work together"

Browse source 
This reverts commit f488de8599.

Reverting for now due to hard to pin down bugs: #13410  #13411
This commit is contained in:
Toshio Kuratomi 2015-12-03 08:01:05 -08:00
parent fbb63d66e7
commit e201a255d1
5 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/plugins/shell/sh.py
View file

@ -138,17 +138,12 @@ class ShellModule(object):
cmd = "%s; %s || (echo \'0 \'%s)" % (test, cmd, shell_escaped_path)
return cmd
def build_module_command(self, env_string, shebang, cmd, arg_path=None, rm_tmp=None, python_interpreter='python'):
def build_module_command(self, env_string, shebang, cmd, arg_path=None, rm_tmp=None):
# don't quote the cmd if it's an empty string, because this will
# break pipelining mode
env = env_string.strip()
exe = shebang.replace("#!", "").strip()
if cmd.strip() == '':
reader = "%s -uc 'import sys; [sys.stdout.write(s) for s in iter(sys.stdin.readline, \"__EOF__942d747a0772c3284ffb5920e234bd57__\\n\")]'|" % python_interpreter
cmd_parts = [env, reader, env, exe]
else:
if cmd.strip() != '':
cmd = pipes.quote(cmd)
cmd_parts = [env, exe, cmd]
cmd_parts = [env_string.strip(), shebang.replace("#!", "").strip(), cmd]
if arg_path is not None:
cmd_parts.append(arg_path)
new_cmd = " ".join(cmd_parts)