sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.client.cache] drop _all_repositories_hash, duplicate of _repositories_hash()

Browse Source
This commit is contained in:
Fabio Erculiani
2013-12-29 10:39:00 +01:00
parent 3c3a376a3b
commit f5eb6c1803
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/entropy/client/interfaces/cache.py
+2 -9
View File
@@ -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())
lib/entropy/client/interfaces/dep.py
+9 -9
View File
@@ -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),