From 1182e86c08100b359481287c2835e62409b3f60d Mon Sep 17 00:00:00 2001 From: Heitor Matsui Date: Fri, 16 Feb 2024 09:21:09 -0300 Subject: [PATCH] Fix package name fetch during start/delete The apt-ostree command expect to receive only the name of the package to install/delete from the package archive repository, and due to [1] the packages are stored with name+version, leading to apt-ostree failure. This commit splits name from version from the package list so that apt-ostree failures are fixed. [1] https://review.opendev.org/c/starlingx/update/+/909046 Test Plan PASS: install a patch release successfully PASS: delete a patch release and verify the package is deleted from apt-ostree package repository successfully Story: 2010676 Task: TBD Change-Id: Id7f8b8379aa0e870f1fa136cb2e629f020dde7f3 Signed-off-by: Heitor Matsui --- software/software/software_controller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/software/software/software_controller.py b/software/software/software_controller.py index 33372256..58610f35 100644 --- a/software/software/software_controller.py +++ b/software/software/software_controller.py @@ -1339,7 +1339,7 @@ class PatchController(PatchService): raise OSTreeTarFail(msg) package_repo_dir = "%s/rel-%s" % (constants.PACKAGE_FEED_DIR, release_sw_version) - packages = self.release_data.metadata[release_id].get("packages") + packages = [pkg.split("_")[0] for pkg in self.release_data.metadata[release_id].get("packages")] if packages: apt_utils.package_remove(package_repo_dir, packages) @@ -2111,9 +2111,9 @@ class PatchController(PatchService): LOG.info(msg) audit_log_info(msg) - packages = self.release_data.metadata[release].get("packages") + packages = [pkg.split("_")[0] for pkg in self.release_data.metadata[release].get("packages")] if packages is None: - msg = "Unable to determine pckages to install" + msg = "Unable to determine packages to install" LOG.error(msg) raise MetadataFail(msg)