mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #4920 from iffy/ansible
Collect all stdout over ssh transport before returning data
This commit is contained in:
parent
441cd1c5b9
commit
389602b8dd
1 changed files with 7 additions and 7 deletions
|
@ -216,8 +216,9 @@ class Connection(object):
|
|||
# We can't use p.communicate here because the ControlMaster may have stdout open as well
|
||||
stdout = ''
|
||||
stderr = ''
|
||||
rpipes = [p.stdout, p.stderr]
|
||||
while True:
|
||||
rfd, wfd, efd = select.select([p.stdout, p.stderr], [], [p.stdout, p.stderr], 1)
|
||||
rfd, wfd, efd = select.select(rpipes, [], rpipes, 1)
|
||||
|
||||
# fail early if the sudo password is wrong
|
||||
if self.runner.sudo and sudoable and self.runner.sudo_pass:
|
||||
|
@ -230,15 +231,14 @@ class Connection(object):
|
|||
dat = os.read(p.stdout.fileno(), 9000)
|
||||
stdout += dat
|
||||
if dat == '':
|
||||
p.wait()
|
||||
break
|
||||
elif p.stderr in rfd:
|
||||
rpipes.remove(p.stdout)
|
||||
if p.stderr in rfd:
|
||||
dat = os.read(p.stderr.fileno(), 9000)
|
||||
stderr += dat
|
||||
if dat == '':
|
||||
p.wait()
|
||||
break
|
||||
elif p.poll() is not None:
|
||||
rpipes.remove(p.stderr)
|
||||
if not rpipes or p.poll() is not None:
|
||||
p.wait()
|
||||
break
|
||||
stdin.close() # close stdin after we read from stdout (see also issue #848)
|
||||
|
||||
|
|
Loading…
Reference in a new issue