valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Back-port #50146 to 2018.3"

Browse Source
This commit is contained in:
Nicole Thomas 2018-10-25 15:55:27 -04:00 committed by GitHub
parent 8dd4f43aec
commit c76ac1b7b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/utils/vt.py
View File

@ -53,7 +53,6 @@ except ImportError:
# Import salt libs
import salt.utils.crypt
import salt.utils.data
import salt.utils.stringutils
from salt.ext.six import string_types
from salt.log.setup import LOG_LEVELS
@ -686,7 +685,7 @@ class Terminal(object):
stdout = None
else:
if self.stream_stdout:
self.stream_stdout.write(salt.utils.data.encode(stdout))
self.stream_stdout.write(stdout)
self.stream_stdout.flush()
if self.stdout_logger:
@ -704,7 +703,7 @@ class Terminal(object):
if self.child_fd is not None:
fcntl.fcntl(self.child_fd, fcntl.F_SETFL, fd_flags)
# <---- Process STDOUT -------------------------------------------
return salt.utils.data.encode(stdout), salt.utils.data.encode(stderr)
return stdout, stderr
def __detect_parent_terminal_size(self):
try: