Skip to content

[pkgs] fix pkgs --update-force error #256

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

Merged
supperthomas merged 1 commit into from
Feb 26, 2025
Merged

[pkgs] fix pkgs --update-force error #256

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
26 changes: 16 additions & 10 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 @@ -752,17 +752,23 @@ def delete_git_package(pkg, remove_path_with_version, force_update, package_dele
)


def delete_zip_package(pkg, remove_path_with_version, package_delete_fail_list, sqlite_pathname):
def delete_zip_package(pkg, remove_path_with_version, force_update, package_delete_fail_list, sqlite_pathname):
if os.path.isdir(remove_path_with_version):
print("Start to remove %s \nplease wait..." % remove_path_with_version.encode("utf-8"))
try:
pkgsdb.deletepackdir(remove_path_with_version, sqlite_pathname)
except Exception as e:
package_delete_fail_list.append(pkg)
logging.warning(
'Error message:\n%s %s. %s \n\t'
% ("Delete folder failed, please delete the folder manually", remove_path_with_version.encode("utf-8"), e)
)
if force_update:
logging.info("package force update, Begin to remove package {0}".format(remove_path_with_version))
if not rm_package(remove_path_with_version):
print("Floder delete fail: %s" % remove_path_with_version.encode("utf-8"))
print("Please delete this folder manually.")
else:
try:
pkgsdb.deletepackdir(remove_path_with_version, sqlite_pathname)
except Exception as e:
package_delete_fail_list.append(pkg)
logging.warning(
'Error message:\n%s %s. %s \n\t'
% ("Delete folder failed, please delete the folder manually", remove_path_with_version.encode("utf-8"), e)
)


def remove_packages(sys_value, force_update):
Expand All @@ -783,7 +789,7 @@ def remove_packages(sys_value, force_update):
if is_git_package(pkg, bsp_packages_path):
delete_git_package(pkg, remove_path_with_version, force_update, package_delete_fail_list)
else:
delete_zip_package(pkg, remove_path_with_version, package_delete_fail_list, sqlite_pathname)
delete_zip_package(pkg, remove_path_with_version, force_update, package_delete_fail_list, sqlite_pathname)

# write error messages
with open(package_error_list_filename, 'w') as f:
Expand Down