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

idf_tools.py: fix virtualenv issue for macOS with homebrew

Browse source
This commit is contained in:
Ivan Grokhotkov 2019-10-30 16:19:17 +01:00
parent f61fd8a664
commit 9279b72a6c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/idf_tools.py
View file

@ -1315,6 +1315,11 @@ def main(argv):
global global_idf_tools_path global global_idf_tools_path
global_idf_tools_path = os.environ.get('IDF_TOOLS_PATH') or os.path.expanduser(IDF_TOOLS_PATH_DEFAULT) global_idf_tools_path = os.environ.get('IDF_TOOLS_PATH') or os.path.expanduser(IDF_TOOLS_PATH_DEFAULT)
# On macOS, unset __PYVENV_LAUNCHER__ variable if it is set.
# Otherwise sys.executable keeps pointing to the system Python, even when a python binary from a virtualenv is invoked.
# See https://bugs.python.org/issue22490#msg283859.
os.environ.pop('__PYVENV_LAUNCER__', None)
if sys.version_info.major == 2: if sys.version_info.major == 2:
try: try:
global_idf_tools_path.decode('ascii') global_idf_tools_path.decode('ascii')