@@ -940,13 +940,19 @@ def package_wizard():
940940def upgrade_packages_index ():
941941 """Update the package repository index."""
942942 env_root = Import ('env_root' )
943-
944943 env_kconfig_path = os .path .join (env_root , 'tools\scripts\cmds' )
945944 env_config_file = os .path .join (env_kconfig_path , '.config' )
946945 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'
946+ get_package_url , get_ver_sha = get_url_from_mirror_server ('packages' , 'latest' )
947+ if get_package_url != None :
948+ git_repo = get_package_url
949+ else :
950+ print ("Failed to get url from mirror server. Using default url." )
951+ git_repo = 'https://gitee.com/RT-Thread-Mirror/packages.git'
948952 else :
949953 git_repo = 'https://github.com/RT-Thread/packages.git'
954+
955+ # print(get_package_url,get_ver_sha)
950956
951957 packages_root = os .path .join (env_root , 'packages' )
952958 pkgs_path = os .path .join (packages_root , 'packages' )
@@ -972,8 +978,7 @@ def upgrade_packages_index():
972978 print ("Begin to upgrade %s." % filename )
973979 cmd = r'git pull'
974980 execute_command (cmd , cwd = package_path )
975- print (
976- "==============================> Env %s update done \n " % filename )
981+ print ("==============================> Env %s update done \n " % filename )
977982
978983
979984def upgrade_env_script ():
@@ -984,12 +989,18 @@ def upgrade_env_script():
984989 env_kconfig_path = os .path .join (env_root , 'tools\scripts\cmds' )
985990 env_config_file = os .path .join (env_kconfig_path , '.config' )
986991 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'
992+ get_package_url , get_ver_sha = get_url_from_mirror_server ('env' , 'latest' )
993+ if get_package_url != None :
994+ env_scripts_repo = get_package_url
995+ else :
996+ print ("Failed to get url from mirror server. Using default url." )
997+ env_scripts_repo = 'https://gitee.com/RT-Thread-Mirror/env.git'
988998 else :
989999 env_scripts_repo = 'https://github.com/RT-Thread/env.git'
9901000
1001+ # print(get_package_url,get_ver_sha)
1002+
9911003 env_scripts_root = os .path .join (env_root , 'tools' , 'scripts' )
992-
9931004 cmd = r'git pull ' + env_scripts_repo
9941005 execute_command (cmd , cwd = env_scripts_root )
9951006 print ("==============================> Env scripts upgrade done \n " )
0 commit comments