From 4749b118bc5e80e3d3ab5999444d078d36bfb1c9 Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Thu, 29 Nov 2018 15:52:09 +0100 Subject: [PATCH] tools: fix idf.py monitor for MSYS --- tools/idf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/idf.py b/tools/idf.py index 5d61d3ec5..64d783867 100755 --- a/tools/idf.py +++ b/tools/idf.py @@ -76,7 +76,7 @@ def _run_tool(tool_name, args, cwd): return arg display_args = " ".join(quote_arg(arg) for arg in args) print("Running %s in directory %s" % (tool_name, quote_arg(cwd))) - print('Executing "%s"...' % display_args) + print('Executing "%s"...' % str(display_args)) try: # 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) @@ -296,7 +296,7 @@ def monitor(action, args): idf_py = [ PYTHON ] + get_commandline_options() # commands to re-run 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 _run_tool("idf_monitor", monitor_args, args.project_dir)