Merge branch 'paramiko-termcap' of git://github.com/madduck/ansible into testing

pull/2089/merge
Michael DeHaan 12 years ago
commit 93f73739d3

@ -110,7 +110,6 @@ class Connection(object):
if len(str(e)) > 0:
msg += ": %s" % str(e)
raise errors.AnsibleConnectionFailed(msg)
chan.get_pty()
if not self.runner.sudo or not sudoable:
if executable:
@ -120,6 +119,12 @@ class Connection(object):
vvv("EXEC %s" % quoted_command, host=self.host)
chan.exec_command(quoted_command)
else:
# sudo usually requires a PTY (cf. requiretty option), therefore
# we give it one, and we try to initialise from the calling
# environment
chan.get_pty(term=os.getenv('TERM', 'vt100'),
width=os.getenv('COLUMNS', 0),
height=os.getenv('LINES', 0))
shcmd, prompt = utils.make_sudo_cmd(sudo_user, executable, cmd)
vvv("EXEC %s" % shcmd, host=self.host)
sudo_output = ''

Loading…
Cancel
Save