Skip to content

[feat][pkgs]:Add whether to delete the package #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CYFS3 wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −3
Open

[feat][pkgs]:Add whether to delete the package #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cmds/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ config SYS_AUTO_UPDATE_PKGS
bool "Auto update pkgs config"
default y

config SYS_PKGS_CONFIRM_DELETE
bool "Confirm before deleting disabled git packages"
default n
help
Ask before deleting a git package folder after the package is disabled.
If disabled, the package folder is deleted directly.

choice
prompt "Select download server"
config SYS_DOWNLOAD_SERVER_AUTO
Expand Down Expand Up @@ -57,4 +64,3 @@ config SYS_PKGS_USING_STATISTICS
which is used to count the number of users

endmenu

14 changes: 12 additions & 2 deletions cmds/cmd_package/cmd_package_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ def is_user_mange_package(bsp_package_path, pkg):
is_China_ip = None


def should_confirm_delete_disabled_git_package():
env_config_file = os.path.join(Import('env_root'), 'tools', 'scripts', 'cmds', '.config')
return os.path.isfile(env_config_file) and find_bool_macro_in_config(env_config_file, 'SYS_PKGS_CONFIRM_DELETE')


def need_using_mirror_download():
global is_China_ip

Expand Down Expand Up @@ -793,9 +798,14 @@ def delete_git_package(pkg, remove_path_with_version, force_update, package_dele
git_folder_to_remove = remove_path_with_version

print("\nStart to remove %s \nplease wait..." % git_folder_to_remove.encode("utf-8"))
if force_update:
logging.info("package force update, Begin to remove package {0}".format(git_folder_to_remove))
if force_update or not should_confirm_delete_disabled_git_package():
if force_update:
logging.info("package force update, Begin to remove package {0}".format(git_folder_to_remove))
else:
logging.info("package disabled, Begin to remove package {0}".format(git_folder_to_remove))
if not rm_package(git_folder_to_remove):
if not force_update:
package_delete_fail_list.append(pkg)
print("Floder delete fail: %s" % git_folder_to_remove.encode("utf-8"))
print("Please delete this folder manually.")
else:
Expand Down