feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Use BuildAsyncPipe only if TTY stream

Browse Source
This commit is contained in:
Ivan Kravets
2019-11-06 22:25:14 +02:00
parent 70f4fa2665
commit 6b44a8ae75
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
platformio/managers/platform.py
View File

@ -23,16 +23,10 @@ from os.path import basename, dirname, isdir, isfile, join
import click import click
import semantic_version import semantic_version
from platformio import __version__, app, exception, fs, util from platformio import __version__, app, exception, fs, proc, util
from platformio.compat import PY2, hashlib_encode_data, is_bytes, load_python_module from platformio.compat import PY2, hashlib_encode_data, is_bytes, load_python_module
from platformio.managers.core import get_core_package_dir from platformio.managers.core import get_core_package_dir
from platformio.managers.package import BasePkgManager, PackageManager from platformio.managers.package import BasePkgManager, PackageManager
from platformio.proc import (
BuildAsyncPipe,
copy_pythonpath_to_osenv,
exec_command,
get_pythonexe_path,
)
from platformio.project.config import ProjectConfig from platformio.project.config import ProjectConfig
try: try:
@ -409,7 +403,7 @@ class PlatformRunMixin(object):
def _run_scons(self, variables, targets, jobs): def _run_scons(self, variables, targets, jobs):
args = [ args = [
get_pythonexe_path(), proc.get_pythonexe_path(),
join(get_core_package_dir("tool-scons"), "script", "scons"), join(get_core_package_dir("tool-scons"), "script", "scons"),
"-Q", "-Q",
"--warn=no-no-parallel-support", "--warn=no-no-parallel-support",
@ -434,18 +428,25 @@ class PlatformRunMixin(object):
except IOError: except IOError:
pass pass
copy_pythonpath_to_osenv() proc.copy_pythonpath_to_osenv()
result = exec_command( if click._compat.isatty(sys.stdout):
args, result = proc.exec_command(
stdout=BuildAsyncPipe( args,
line_callback=self._on_stdout_line, stdout=proc.BuildAsyncPipe(
data_callback=lambda data: _write_and_flush(sys.stdout, data), line_callback=self._on_stdout_line,
), data_callback=lambda data: _write_and_flush(sys.stdout, data),
stderr=BuildAsyncPipe( ),
line_callback=self._on_stderr_line, stderr=proc.BuildAsyncPipe(
data_callback=lambda data: _write_and_flush(sys.stderr, data), line_callback=self._on_stderr_line,
), data_callback=lambda data: _write_and_flush(sys.stderr, data),
) ),
)
else:
result = proc.exec_command(
args,
stdout=proc.LineBufferedAsyncPipe(line_callback=self._on_stdout_line),
stderr=proc.LineBufferedAsyncPipe(line_callback=self._on_stderr_line),
)
return result return result
def _on_stdout_line(self, line): def _on_stdout_line(self, line):