From 959e6f7da91a8b751084c33a6ed0db807f72b0b9 Mon Sep 17 00:00:00 2001 From: Damien George Date: Tue, 21 Dec 2021 23:16:51 +1100 Subject: [PATCH] tools/upip.py: Skip '.frozen' entry in sys.path for install path. Signed-off-by: Damien George --- tools/upip.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/upip.py b/tools/upip.py index a6d4c93ae3bd..9fb87264201e 100644 --- a/tools/upip.py +++ b/tools/upip.py @@ -262,6 +262,8 @@ def get_install_path(): if install_path is None: # sys.path[0] is current module's path install_path = sys.path[1] + if install_path == ".frozen": + install_path = sys.path[2] install_path = expandhome(install_path) return install_path @@ -281,11 +283,11 @@ def help(): Usage: micropython -m upip install [-p ] ... | -r import upip; upip.install(package_or_list, []) -If is not given, packages will be installed into sys.path[1] -(can be set from MICROPYPATH environment variable, if current system -supports that).""" +If isn't given, packages will be installed to sys.path[1], or +sys.path[2] if the former is .frozen (path can be set from MICROPYPATH +environment variable if supported).""" ) - print("Current value of sys.path[1]:", sys.path[1]) + print("Default install path:", get_install_path()) print( """\