Commit c840cbaa by James Cammarata

Merge branch 'fork_fixes' of https://github.com/akerl/ansible into akerl-fork_fixes

parents 69cfcf7e 98bf473c
...@@ -26,6 +26,7 @@ import fcntl ...@@ -26,6 +26,7 @@ import fcntl
import hmac import hmac
import pwd import pwd
import gettext import gettext
import pty
from hashlib import sha1 from hashlib import sha1
import ansible.constants as C import ansible.constants as C
from ansible.callbacks import vvv from ansible.callbacks import vvv
...@@ -181,11 +182,11 @@ class Connection(object): ...@@ -181,11 +182,11 @@ class Connection(object):
try: try:
# Make sure stdin is a proper (pseudo) pty to avoid: tcgetattr errors # Make sure stdin is a proper (pseudo) pty to avoid: tcgetattr errors
import pty
master, slave = pty.openpty() master, slave = pty.openpty()
p = subprocess.Popen(ssh_cmd, stdin=slave, p = subprocess.Popen(ssh_cmd, stdin=slave,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdin = os.fdopen(master, 'w', 0) stdin = os.fdopen(master, 'w', 0)
os.close(slave)
except: except:
p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE, p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment