Merge branch 'bugfix/idf_tools_pylauncher_v4.1' into 'release/v4.1'

idf_tools.py: fix typo in __PYVENV_LAUNCHER__ env variable name (backport v4.1)

See merge request espressif/esp-idf!7478
This commit is contained in:
Ivan Grokhotkov
2020-02-18 16:24:56 +08:00

View File

@@ -1356,7 +1356,7 @@ def main(argv):
# On macOS, unset __PYVENV_LAUNCHER__ variable if it is set. # 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. # 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. # See https://bugs.python.org/issue22490#msg283859.
os.environ.pop('__PYVENV_LAUNCER__', None) os.environ.pop('__PYVENV_LAUNCHER__', None)
if sys.version_info.major == 2: if sys.version_info.major == 2:
try: try: