From d0dd559f21152ec6b195d67254aa37733bcb2958 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Wed, 14 Sep 2022 00:24:13 -0400 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8ip=E5=BD=92=E5=B1=9E=E5=9C=B0=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=A4=B1=E6=95=88=E5=90=8E=E9=87=87=E7=94=A8=E6=97=B6?= =?UTF-8?q?=E5=8C=BA=E4=BD=9C=E4=B8=BA=E5=90=8E=E5=A4=87=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmds/cmd_package/cmd_package_update.py | 6 ++++-- cmds/cmd_package/cmd_package_upgrade.py | 13 ++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cmds/cmd_package/cmd_package_update.py b/cmds/cmd_package/cmd_package_update.py index ec0be6a2..ad55e87f 100644 --- a/cmds/cmd_package/cmd_package_update.py +++ b/cmds/cmd_package/cmd_package_update.py @@ -144,8 +144,10 @@ def need_using_mirror_download(): else: return False except: - print('Fail to get the ip location!') - return False + if (-time.timezone)/3600 == 8: + return True + else: + False def is_git_url(package_url): diff --git a/cmds/cmd_package/cmd_package_upgrade.py b/cmds/cmd_package/cmd_package_upgrade.py index a80edaa8..492f2822 100644 --- a/cmds/cmd_package/cmd_package_upgrade.py +++ b/cmds/cmd_package/cmd_package_upgrade.py @@ -45,13 +45,10 @@ def upgrade_packages_index(force_upgrade=False): """Update the package repository index.""" - env_root = Import('env_root') pkgs_root = Import('pkgs_root') - env_kconfig_path = os.path.join(env_root, r'tools\scripts\cmds') - env_config_file = os.path.join(env_kconfig_path, '.config') - if need_using_mirror_download(env_config_file): - get_package_url, get_ver_sha = get_url_from_mirror_server('packages', 'latest') + if need_using_mirror_download(): + get_package_url = get_url_from_mirror_server('packages', 'latest') if get_package_url is not None: git_repo = get_package_url @@ -102,11 +99,9 @@ def upgrade_env_script(force_upgrade=False): """Update env function scripts.""" env_root = Import('env_root') - env_kconfig_path = os.path.join(env_root, r'tools\scripts\cmds') - env_config_file = os.path.join(env_kconfig_path, '.config') - if need_using_mirror_download(env_config_file): - get_package_url, get_ver_sha = get_url_from_mirror_server('env', 'latest') + if need_using_mirror_download(): + get_package_url = get_url_from_mirror_server('env', 'latest') if get_package_url is not None: env_scripts_repo = get_package_url