Skip to content

Commit 0537de7

Browse files
committed
【完善】:去除多余的用户选项
1 parent dd7bf2a commit 0537de7

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

cmds/cmd_package.py

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ def install_pkg(env_root, bsp_root, pkg):
244244
get_ver_sha = None
245245

246246
if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
247-
get_package_url, get_ver_sha = get_url_from_mirror_server(
248-
pkgs_name_in_json, pkg['ver'])
247+
get_package_url, get_ver_sha = get_url_from_mirror_server(pkgs_name_in_json, pkg['ver'])
249248

250249
if get_package_url != None:
251250
package_url = get_package_url
@@ -286,8 +285,7 @@ def install_pkg(env_root, bsp_root, pkg):
286285
print("Start to update submodule")
287286

288287
if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
289-
replace_list = modify_submod_file_to_mirror(
290-
submod_path) # Modify .gitmodules file
288+
replace_list = modify_submod_file_to_mirror(submod_path) # Modify .gitmodules file
291289

292290
cmd = 'git submodule update --init --recursive'
293291
if not os.system(cmd):
@@ -568,17 +566,12 @@ def pre_package_update():
568566
bsp_packages_path, 'pkgs_delete_error_list.json')
569567

570568
if not os.path.exists(pkgs_error_list_fn):
571-
print ("Maybe you delete the file pkgs_delete_error_list.json by mistake.")
572-
print ("Do you want to create a new pkgs_delete_error_list.json ?")
573-
rc = raw_input(
574-
'Press the Y Key to create a new pkgs_delete_error_list.json.')
575-
if rc == 'y' or rc == 'Y':
576-
os.chdir(bsp_packages_path)
577-
fp = open("pkgs_delete_error_list.json", 'w')
578-
fp.write("[]")
579-
fp.close()
580-
os.chdir(bsp_root)
581-
print ("Create a new file pkgs_delete_error_list.json done.")
569+
os.chdir(bsp_packages_path)
570+
fp = open("pkgs_delete_error_list.json", 'w')
571+
fp.write("[]")
572+
fp.close()
573+
os.chdir(bsp_root)
574+
print ("Create a new error file : pkgs_delete_error_list.json.")
582575

583576
# Reading data back from pkgs_delete_error_list.json
584577
with open(pkgs_error_list_fn, 'r') as f:
@@ -969,8 +962,7 @@ def upgrade_packages_index():
969962
if os.path.isdir(os.path.join(package_path, '.git')):
970963
cmd = r'git pull'
971964
execute_command(cmd, cwd=package_path)
972-
print(
973-
"==============================> Env %s update done \n" % filename)
965+
print("==============================> Env %s update done \n" % filename)
974966

975967

976968
def upgrade_env_script():

0 commit comments

Comments
 (0)