[entropy.client.cache] drop methods used by the dep module only

lib/entropy/client/interfaces/cache.py

@@ -104,25 +104,6 @@ class CacheMixin:
         """
         return self.__repositories_hash(self._enabled_repos)
 
-    def _get_updates_cache(self, empty_deps, repo_hash = None):
-        """
-        Get available updates on-disk cache, if available, otherwise return None
-        """
-        misc_settings = self.ClientSettings()['misc']
-        ignore_spm_downgrades = misc_settings['ignore_spm_downgrades']
-
-        if self.xcache:
-
-            if repo_hash is None:
-                repo_hash = self._repositories_hash()
-
-            c_hash = self._get_updates_cache_hash(repo_hash, empty_deps,
-                ignore_spm_downgrades)
-
-            disk_cache = self._cacher.pop(c_hash)
-            if isinstance(disk_cache, tuple):
-                return disk_cache
-
     def _filter_available_repositories(self, _enabled_repos = None):
         """
         Filter out package repositories from the list of available,
@@ -139,34 +120,3 @@ class CacheMixin:
         enabled_repos = [x for x in enabled_repos if not \
             x.endswith(etpConst['packagesext'])]
         return enabled_repos
-
-    def _get_updates_cache_hash(self, repo_hash, empty_deps,
-        ignore_spm_downgrades):
-        """
-        Get package updates cache hash that can be used to retrieve the on-disk
-        cached object.
-        """
-        enabled_repos = self._filter_available_repositories()
-        repo_order = [x for x in self._settings['repositories']['order'] if
-            x in enabled_repos]
-
-        inst_repo = self.installed_repository()
-
-        cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|v3" % (
-            repo_hash,
-            empty_deps,
-            enabled_repos,
-            inst_repo.checksum(),
-            self._all_repositories_hash(),
-            ";".join(sorted(self._settings['repositories']['available'])),
-            repo_order,
-            ignore_spm_downgrades,
-            # needed when users do bogus things like editing config files
-            # manually (branch setting)
-            self._settings['repositories']['branch'],
-        )
-        sha = hashlib.sha1()
-        sha.update(const_convert_to_rawstring(cache_s))
-        return "%s%s" % (
-            EntropyCacher.CACHE_IDS['world_update'],
-            sha.hexdigest(),)

lib/entropy/client/interfaces/dep.py

@@ -3065,10 +3065,34 @@ class CalculatorsMixin:
                     'critical_found': True,
                     }
 
-        repo_hash = self._repositories_hash()
+        inst_repo = self.installed_repository()
+        ignore_spm_downgrades = misc_settings['ignore_spm_downgrades']
+        enabled_repos = self._filter_available_repositories()
+        repo_order = [x for x in self._settings['repositories']['order'] if
+                      x in enabled_repos]
+
+        cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|v4" % (
+            self._repositories_hash(),
+            empty,
+            enabled_repos,
+            inst_repo.checksum(),
+            self._all_repositories_hash(),
+            ";".join(sorted(self._settings['repositories']['available'])),
+            repo_order,
+            ignore_spm_downgrades,
+            # needed when users do bogus things like editing config files
+            # manually (branch setting)
+            self._settings['repositories']['branch'],
+        )
+
+        sha = hashlib.sha1()
+        sha.update(const_convert_to_rawstring(cache_s))
+        cache_key = "%s%s" % (
+            EntropyCacher.CACHE_IDS['world_update'],
+            sha.hexdigest(),)
+
         if use_cache and self.xcache:
-            cached = self._get_updates_cache(empty_deps = empty,
-                repo_hash = repo_hash)
+            cached = self._cacher.pop(cache_key)
             if cached is not None:
                 return cached
 
@@ -3078,8 +3102,6 @@ class CalculatorsMixin:
         match_repos = tuple([x for x in \
             self._settings['repositories']['order'] if x in enabled_repos])
 
-        ignore_spm_downgrades = misc_settings['ignore_spm_downgrades']
-
         # get all the installed packages
         try:
             package_ids = collections.deque(
@@ -3281,9 +3303,7 @@ class CalculatorsMixin:
             }
 
         if self.xcache:
-            c_hash = self._get_updates_cache_hash(repo_hash, empty,
-                ignore_spm_downgrades)
-            self._cacher.push(c_hash, outcome, async = False)
+            self._cacher.push(cache_key, outcome, async = False)
             self._cacher.sync()
 
         if not update: