tools: fix idf.py monitor for MSYS

This commit is contained in:
Roland Dobai 2018-11-29 15:52:09 +01:00
parent 0b21be508e
commit 8ec0c82c3f

View File

@ -76,7 +76,7 @@ def _run_tool(tool_name, args, cwd):
return arg return arg
display_args = " ".join(quote_arg(arg) for arg in args) display_args = " ".join(quote_arg(arg) for arg in args)
print("Running %s in directory %s" % (tool_name, quote_arg(cwd))) print("Running %s in directory %s" % (tool_name, quote_arg(cwd)))
print('Executing "%s"...' % display_args) print('Executing "%s"...' % str(display_args))
try: try:
# Note: we explicitly pass in os.environ here, as we may have set IDF_PATH there during startup # Note: we explicitly pass in os.environ here, as we may have set IDF_PATH there during startup
subprocess.check_call(args, env=os.environ, cwd=cwd) subprocess.check_call(args, env=os.environ, cwd=cwd)
@ -290,7 +290,7 @@ def monitor(action, args):
idf_py = [ PYTHON ] + get_commandline_options() # commands to re-run idf.py idf_py = [ PYTHON ] + get_commandline_options() # commands to re-run idf.py
monitor_args += [ "-m", " ".join("'%s'" % a for a in idf_py) ] monitor_args += [ "-m", " ".join("'%s'" % a for a in idf_py) ]
if "MSYSTEM" is os.environ: if "MSYSTEM" in os.environ:
monitor_args = [ "winpty" ] + monitor_args monitor_args = [ "winpty" ] + monitor_args
_run_tool("idf_monitor", monitor_args, args.project_dir) _run_tool("idf_monitor", monitor_args, args.project_dir)