From 11670a122dcdf906ce811204c911f1463fceb6de Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Wed, 24 Aug 2016 09:41:09 +0200
Subject: [PATCH] Optimize code for dnf-2.0

---
 dnfdaemon.spec                      | 2 +-
 python/dnfdaemon/server/__init__.py | 2 +-
 python/dnfdaemon/server/backend.py  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dnfdaemon.spec b/dnfdaemon.spec
index 9ece728..1054e1b 100644
--- a/dnfdaemon.spec
+++ b/dnfdaemon.spec
@@ -1,5 +1,5 @@
 %global dnf_org org.baseurl.Dnf
-%global dnf_version 1.1.0
+%global dnf_version 2.0.0
 
 Name:           dnfdaemon
 Version:        0.3.16
diff --git a/python/dnfdaemon/server/__init__.py b/python/dnfdaemon/server/__init__.py
index 4700c50..d304f9f 100644
--- a/python/dnfdaemon/server/__init__.py
+++ b/python/dnfdaemon/server/__init__.py
@@ -253,7 +253,7 @@ def get_groups(self):
                 grp = self.base.comps.group_by_pattern(obj.name)
                 if grp:
                     # FIXME: no dnf API to get if group is installed
-                    p_grp = self.base.group_persistor.group(grp.id)
+                    p_grp = self.base._group_persistor.group(grp.id)
                     if p_grp:
                         installed = p_grp.installed
                     else:
diff --git a/python/dnfdaemon/server/backend.py b/python/dnfdaemon/server/backend.py
index ee5bbc6..706ac9b 100644
--- a/python/dnfdaemon/server/backend.py
+++ b/python/dnfdaemon/server/backend.py
@@ -61,7 +61,7 @@ def __init__(self, parent):
     def expire_cache(self):
         """Make the current cache expire"""
         for repo in self.repos.iter_enabled():
-            repo.md_expire_cache()
+            repo._md_expire_cache()
 
     def setup_base(self):
         """Setup dnf Sack and init packages helper"""
@@ -126,7 +126,7 @@ def _sig_check_pkg(self, po):
                     might help.
               2 = Fatal GPG verification error, give up.
         """
-        if po.from_cmdline:
+        if po._from_cmdline:
             check = self.conf.localpkg_gpgcheck
             hasgpgkey = 0
         else:
@@ -270,7 +270,7 @@ class Packages:
     def __init__(self, base):
         self._base = base
         self._sack = base.sack
-        self._inst_na = self._sack.query().installed().na_dict()
+        self._inst_na = self._sack.query().installed()._na_dict()
 
     def filter_packages(self, pkg_list, replace=True):
         """Filter a list of package objects and replace