X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-update%2Ffiles%2F0007-patch_agent-do-not-do-the-packages_iter-if-pkggrp-is.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-update%2Ffiles%2F0007-patch_agent-do-not-do-the-packages_iter-if-pkggrp-is.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=149e1e2afdf72274c3b453952adb2fa49b4a6d42;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-update/files/0007-patch_agent-do-not-do-the-packages_iter-if-pkggrp-is.patch b/meta-starlingx/meta-stx-flock/stx-update/files/0007-patch_agent-do-not-do-the-packages_iter-if-pkggrp-is.patch
deleted file mode 100644
index 149e1e2..0000000
--- a/meta-starlingx/meta-stx-flock/stx-update/files/0007-patch_agent-do-not-do-the-packages_iter-if-pkggrp-is.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 059984de897fe2c8c48811ceb76a0331f94b3557 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 13 May 2020 22:10:01 +0800
-Subject: [PATCH] patch_agent: do not do the packages_iter if pkggrp is None
-
-Addn the handling of packages_iter to the else block to avoid:
-AttributeError: 'NoneType' object has no attribute 'packages_iter'
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py | 44 ++++++++++++-------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-index d8bc375..489d484 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-@@ -490,29 +490,29 @@ class PatchAgent(PatchService):
-                 break
- 
-         if pkggrp is None:
--            LOG.error("Could not find software group: %s", grp_id)
--
--        for pkg in pkggrp.packages_iter():
--            try:
--                res = pkgs_installed.filter(name=pkg.name)
--                if len(res) == 0:
--                    found_pkg = avail.filter(name=pkg.name)
--                    self.missing_pkgs_dnf.append(found_pkg[0])
--                    self.missing_pkgs.append(found_pkg[0].name)
-+            LOG.warning("Could not find software group: %s", grp_id)
-+        else:
-+            for pkg in pkggrp.packages_iter():
-+                try:
-+                    res = pkgs_installed.filter(name=pkg.name)
-+                    if len(res) == 0:
-+                        found_pkg = avail.filter(name=pkg.name)
-+                        self.missing_pkgs_dnf.append(found_pkg[0])
-+                        self.missing_pkgs.append(found_pkg[0].name)
-+                        self.changes = True
-+                except dnf.exceptions.PackageNotFoundError:
-+                    self.missing_pkgs_dnf.append(pkg)
-+                    self.missing_pkgs.append(pkg.name)
-                     self.changes = True
--            except dnf.exceptions.PackageNotFoundError:
--                self.missing_pkgs_dnf.append(pkg)
--                self.missing_pkgs.append(pkg.name)
--                self.changes = True
--
--        self.installed = self.pkgobjs_to_list(self.installed_dnf)
--        self.to_install = self.pkgobjs_to_list(self.to_install_dnf + self.to_downgrade_dnf)
--
--        LOG.info("Patch state query returns %s", self.changes)
--        LOG.info("Installed: %s", self.installed)
--        LOG.info("To install: %s", self.to_install)
--        LOG.info("To remove: %s", self.to_remove)
--        LOG.info("Missing: %s", self.missing_pkgs)
-+
-+            self.installed = self.pkgobjs_to_list(self.installed_dnf)
-+            self.to_install = self.pkgobjs_to_list(self.to_install_dnf + self.to_downgrade_dnf)
-+
-+            LOG.info("Patch state query returns %s", self.changes)
-+            LOG.info("Installed: %s", self.installed)
-+            LOG.info("To install: %s", self.to_install)
-+            LOG.info("To remove: %s", self.to_remove)
-+            LOG.info("Missing: %s", self.missing_pkgs)
- 
-         return True
- 
--- 
-2.7.4
-