Fix apply process for install/remove with invalid packages

Author: Korney Gedert

gpoa/apt1_runner

@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import rpm
 from gpoa.storage import registry_factory
 from util.util import get_uid_by_username, string_to_literal_eval
 import logging
@@ -27,7 +28,24 @@ import locale
 import dbus
 import dbus.mainloop.glib
 
-def remove_prefix(item):
+def is_rpm_installed(rpm_name):
+    """
+    Check if the package named 'rpm_name' is installed
+    """
+    ts = rpm.TransactionSet()
+    pm = ts.dbMatch('name', rpm_name)
+    if pm.count() > 0:
+        return True
+
+    return False
+
+def is_rpm_notinstalled(rpm_name):
+    """
+    Check if the package named 'rpm_name' is not installed
+    """
+    return not is_rpm_installed(rpm_name)
+
+def remove_suffix(item):
     return '-' + str(item)
 
 class Apt_applier:
@@ -58,7 +76,8 @@ class Apt_applier:
 
         self.remove_packages = set(map(str.strip, string_to_literal_eval(dict_packages.get(remove_key_name,[]))))
         self.install_packages = map(str.strip, string_to_literal_eval(dict_packages.get(install_key_name,[])))
-        self.install_packages = set([item for item in self.install_packages if item not in self.remove_packages])
+        self.install_packages = set(filter(is_rpm_notinstalled, [item for item in self.install_packages if item not in self.remove_packages]))
+        self.remove_packages = filter(is_rpm_installed, self.remove_packages)
 
     def apply(self):
         """
@@ -69,7 +88,17 @@ class Apt_applier:
             response
         """
         # TODO: add package install/remove logging
-        response = self.apt_iface.ApplyAsync(" ".join(self.remove_packages), " ".join(map(str, self.install_packages)) + " ".join(map(remove_prefix, self.remove_packages)))
+        response = self.apt_iface.ApplyAsync(" ".join(self.remove_packages),
+                                             " ".join(map(str, self.install_packages)) + " ".join(
+                                                 map(remove_suffix, self.remove_packages)))
+        if response != 0:
+            remove_packages = filter(is_rpm_installed, self.remove_packages)
+            install_packages = filter(is_rpm_notinstalled, self.install_packages)
+            for package in remove_packages:
+                self.apt_iface.ApplyAsync(package, remove_suffix(package))
+            for package in install_packages:
+                self.apt_iface.ApplyAsync(package, package)
+
         print(f"ApplyAsync started with response code: {response}")
         return response