Skip to content

Commit e9285cc

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'fix/env_var_idf_path_old_not_set_in_ps1_v5.4' into 'release/v5.4'
fix(tools): IDF_PATH_OLD not found in PowerShell (v5.4) See merge request espressif/esp-idf!37076
2 parents 6d455fe + 1de2bee commit e9285cc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/activate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def die(msg: str) -> None:
4343
f'proceeding.'))
4444

4545
try:
46-
run([virtualenv_python, os.path.join(idf_path, 'tools', 'export_utils', 'activate_venv.py')] + sys.argv[1:], check=True)
47-
except (OSError, SubprocessError):
48-
die('\n'.join(['Activation script failed',
46+
run([virtualenv_python, os.path.join(idf_path, 'tools', 'export_utils', 'activate_venv.py')] + sys.argv[1:], check=True, env=os.environ.copy())
47+
except (OSError, SubprocessError) as e:
48+
die('\n'.join(['Activation script failed', str(e),
4949
'To view detailed debug information, set ESP_IDF_EXPORT_DEBUG=1 and run the export script again.']))

0 commit comments

Comments
 (0)