Skip to content

Commit 5855b77

Browse files
committed
【完善】:从镜像服务器获取env更新地址
1 parent 1506f62 commit 5855b77

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

cmds/cmd_package.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -939,14 +939,21 @@ def package_wizard():
939939

940940
def upgrade_packages_index():
941941
"""Update the package repository index."""
942+
942943
env_root = Import('env_root')
943-
944944
env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')
945945
env_config_file = os.path.join(env_kconfig_path, '.config')
946946
if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
947-
git_repo = 'https://gitee.com/RT-Thread-Mirror/packages.git'
947+
get_package_url, get_ver_sha = get_url_from_mirror_server('packages', 'latest')
948+
if get_package_url != None:
949+
git_repo = get_package_url
950+
else:
951+
print("Failed to get url from mirror server. Using default url.")
952+
git_repo = 'https://gitee.com/RT-Thread-Mirror/packages.git'
948953
else:
949954
git_repo = 'https://github.com/RT-Thread/packages.git'
955+
956+
# print(get_package_url,get_ver_sha)
950957

951958
packages_root = os.path.join(env_root, 'packages')
952959
pkgs_path = os.path.join(packages_root, 'packages')
@@ -972,8 +979,7 @@ def upgrade_packages_index():
972979
print("Begin to upgrade %s." % filename)
973980
cmd = r'git pull'
974981
execute_command(cmd, cwd=package_path)
975-
print(
976-
"==============================> Env %s update done \n" % filename)
982+
print("==============================> Env %s update done \n" % filename)
977983

978984

979985
def upgrade_env_script():
@@ -984,12 +990,18 @@ def upgrade_env_script():
984990
env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')
985991
env_config_file = os.path.join(env_kconfig_path, '.config')
986992
if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
987-
env_scripts_repo = 'https://gitee.com/RT-Thread-Mirror/env.git'
993+
get_package_url, get_ver_sha = get_url_from_mirror_server('env', 'latest')
994+
if get_package_url != None:
995+
env_scripts_repo = get_package_url
996+
else:
997+
print("Failed to get url from mirror server. Using default url.")
998+
env_scripts_repo = 'https://gitee.com/RT-Thread-Mirror/env.git'
988999
else:
9891000
env_scripts_repo = 'https://github.com/RT-Thread/env.git'
9901001

1002+
# print(get_package_url,get_ver_sha)
1003+
9911004
env_scripts_root = os.path.join(env_root, 'tools', 'scripts')
992-
9931005
cmd = r'git pull ' + env_scripts_repo
9941006
execute_command(cmd, cwd=env_scripts_root)
9951007
print("==============================> Env scripts upgrade done \n")

0 commit comments

Comments
 (0)