tools: Fix idf.py menuconfig characters in MSYS2

This commit is contained in:
Roland Dobai 2019-10-04 12:15:19 +02:00 committed by bot
parent d3ed17acd7
commit d24086c529

View file

@ -1529,13 +1529,18 @@ if __name__ == "__main__":
if ("MSYSTEM" in os.environ) and (
not os.environ.get("_", "").endswith(WINPTY_EXE) and WINPTY_VAR not in os.environ
):
os.environ[WINPTY_VAR] = "1" # the value is of no interest to us
# idf.py calls itself with "winpty" and WINPTY global variable set
ret = subprocess.call(
[WINPTY_EXE, sys.executable] + sys.argv, env=os.environ
)
if ret:
raise SystemExit(ret)
if 'menuconfig' in sys.argv:
# don't use winpty for menuconfig because it will print weird characters
main()
else:
os.environ[WINPTY_VAR] = "1" # the value is of no interest to us
# idf.py calls itself with "winpty" and WINPTY global variable set
ret = subprocess.call(
[WINPTY_EXE, sys.executable] + sys.argv, env=os.environ
)
if ret:
raise SystemExit(ret)
elif os.name == "posix" and not _valid_unicode_config():
# Trying to find best utf-8 locale available on the system and restart python with it