Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/idfpy_monitor_msys' into 'master'

Browse source 
tools: fix idf.py monitor for MSYS

Closes #51

See merge request idf/esp-idf!3839
This commit is contained in:
Angus Gratton 2018-12-05 17:39:36 +08:00
commit f1b4c18c2a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/idf.py
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)
@ -296,7 +296,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)