From f5eb6c1803e141bb84a3eb7473cab73d550bf53c Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sun, 29 Dec 2013 10:39:00 +0100
Subject: [PATCH] [entropy.client.cache] drop _all_repositories_hash, duplicate
 of _repositories_hash()

---
 lib/entropy/client/interfaces/cache.py | 11 ++---------
 lib/entropy/client/interfaces/dep.py   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/lib/entropy/client/interfaces/cache.py b/lib/entropy/client/interfaces/cache.py
index f0374fb94..220f485a2 100644
--- a/lib/entropy/client/interfaces/cache.py
+++ b/lib/entropy/client/interfaces/cache.py
@@ -39,13 +39,6 @@ class CacheMixin:
         sha.update(const_convert_to_rawstring(repr(c_hash)))
         return sha.hexdigest()
 
-    def _repositories_hash(self):
-        """
-        Return the checksum of available repositories, excluding package ones.
-        """
-        enabled_repos = self.filter_repositories(self.repositories())
-        return self._selective_repositories_hash(enabled_repos)
-
     def _selective_repositories_hash(self, repositories):
         sha = hashlib.sha1()
         sha.update(const_convert_to_rawstring("0"))
@@ -67,9 +60,9 @@ class CacheMixin:
                 )
         return sha.hexdigest()
 
-    def _all_repositories_hash(self):
+    def _repositories_hash(self):
         """
         Return the checksum of all the available repositories, including
         package repos.
         """
-        return self._selective_repositories_hash(self._enabled_repos)
+        return self._selective_repositories_hash(self.repositories())
diff --git a/lib/entropy/client/interfaces/dep.py b/lib/entropy/client/interfaces/dep.py
index c7433897b..34258edc4 100644
--- a/lib/entropy/client/interfaces/dep.py
+++ b/lib/entropy/client/interfaces/dep.py
@@ -192,7 +192,7 @@ class CalculatorsMixin:
                 atom,
                 ";".join(match_repo),
                 match_slot,
-                self._all_repositories_hash(),
+                self._repositories_hash(),
                 mask_filter,
                 ";".join(self._enabled_repos),
                 ";".join(sorted(self._settings['repositories']['available'])),
@@ -372,7 +372,7 @@ class CalculatorsMixin:
                 keyword,
                 ";".join(repositories),
                 description,
-                self._all_repositories_hash(),
+                self._repositories_hash(),
                 self._settings.packages_configuration_hash(),
                 self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
@@ -651,7 +651,7 @@ class CalculatorsMixin:
                 ";".join(sorted(dependencies)),
                 deep_deps,
                 inst_repo.checksum(),
-                self._all_repositories_hash(),
+                self._repositories_hash(),
                 self._settings.packages_configuration_hash(),
                 self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
@@ -1883,7 +1883,7 @@ class CalculatorsMixin:
                 match,
                 installed_package_id,
                 inst_repo.checksum(),
-                self._all_repositories_hash(),
+                self._repositories_hash(),
                 self._settings.packages_configuration_hash(),
                 self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
@@ -2174,7 +2174,7 @@ class CalculatorsMixin:
                 only_deps,
                 recursive,
                 inst_repo.checksum(),
-                self._all_repositories_hash(),
+                self._repositories_hash(),
                 self._settings.packages_configuration_hash(),
                 self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(sorted(self._settings['repositories']['available'])),
@@ -2452,7 +2452,7 @@ class CalculatorsMixin:
                 system_packages,
                 elf_needed_scanning,
                 inst_repo.checksum(),
-                self._all_repositories_hash(),
+                self._repositories_hash(),
                 self._settings.packages_configuration_hash(),
                 self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
@@ -2987,7 +2987,7 @@ class CalculatorsMixin:
             self._repositories_hash(),
             enabled_repos,
             inst_repo.checksum(),
-            self._all_repositories_hash(),
+            self._repositories_hash(),
             self._settings.packages_configuration_hash(),
                 self._settings_client_plugin.packages_configuration_hash(),
             ";".join(sorted(self._settings['repositories']['available'])),
@@ -3132,7 +3132,7 @@ class CalculatorsMixin:
             empty,
             enabled_repos,
             inst_repo.checksum(),
-            self._all_repositories_hash(),
+            self._repositories_hash(),
             self._settings.packages_configuration_hash(),
             self._settings_client_plugin.packages_configuration_hash(),
             ";".join(sorted(self._settings['repositories']['available'])),
@@ -3540,7 +3540,7 @@ class CalculatorsMixin:
                 atom,
                 deep,
                 inst_repo.checksum(),
-                self._all_repositories_hash(),
+                self._repositories_hash(),
                 self._settings.packages_configuration_hash(),
                 self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),