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

tools: Fix idf.py menuconfig characters in MSYS2

Browse source
This commit is contained in:
Roland Dobai 2019-10-04 12:15:19 +02:00 committed by Roland Dobai
parent c875e5698a
commit 4f193dfa71
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/idf.py
View file

@ -1282,13 +1282,18 @@ if __name__ == "__main__":
if ("MSYSTEM" in os.environ) and ( if ("MSYSTEM" in os.environ) and (
not os.environ.get("_", "").endswith(WINPTY_EXE) and WINPTY_VAR not in os.environ 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 if 'menuconfig' in sys.argv:
ret = subprocess.call( # don't use winpty for menuconfig because it will print weird characters
[WINPTY_EXE, sys.executable] + sys.argv, env=os.environ main()
) else:
if ret: os.environ[WINPTY_VAR] = "1" # the value is of no interest to us
raise SystemExit(ret) # 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(): 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 # Trying to find best utf-8 locale available on the system and restart python with it