Merge branch 'bugfix/idf_monitor_baudrate_arg_crash_v4.2' into 'release/v4.2'

idf monitor: fix crash when monitor baudrate argument set (Backport v4.2)

See merge request espressif/esp-idf!9758
This commit is contained in:
Ivan Grokhotkov
2021-02-05 10:06:07 +08:00
2 changed files with 2 additions and 1 deletions

View File

@ -27,7 +27,7 @@ def action_extensions(base_actions, project_path):
ports[0].encode("ascii", "ignore")) ports[0].encode("ascii", "ignore"))
return ports[0] return ports[0]
except IndexError: except IndexError:
raise RuntimeError( raise FatalError(
"No serial ports found. Connect a device, or use '-p PORT' option to set a specific port.") "No serial ports found. Connect a device, or use '-p PORT' option to set a specific port.")
def _get_esptool_args(args): def _get_esptool_args(args):

View File

@ -71,6 +71,7 @@ def run_tool(tool_name, args, cwd, env=dict()):
return "'" + arg + "'" return "'" + arg + "'"
return arg return arg
args = [str(arg) for arg in args]
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"...' % str(display_args)) print('Executing "%s"...' % str(display_args))