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

[entropy.client] change _get_updates_cache_hash() output

Browse Source
This commit is contained in:
Fabio Erculiani
2009-12-25 18:51:21 +01:00
parent de911ac5b6
commit 543d72889e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropy/client/interfaces/cache.py
+4 -4
View File
@@ -176,9 +176,8 @@ class CacheMixin:
if db_digest == None:
db_digest = self.all_repositories_checksum()
c_hash = "%s%s" % (etpCache['world_update'],
self._get_updates_cache_hash(db_digest, empty_deps,
ignore_spm_downgrades),)
c_hash = self._get_updates_cache_hash(db_digest, empty_deps,
ignore_spm_downgrades)
disk_cache = self.Cacher.pop(c_hash)
if isinstance(disk_cache, tuple):
@@ -187,7 +186,7 @@ class CacheMixin:
def _get_updates_cache_hash(self, db_digest, empty_deps,
ignore_spm_downgrades):
return str(hash("%s|%s|%s|%s|%s|%s" % (
c_hash = str(hash("%s|%s|%s|%s|%s|%s" % (
db_digest, empty_deps, self.validRepositories,
self.SystemSettings['repositories']['order'],
ignore_spm_downgrades,
@@ -195,6 +194,7 @@ class CacheMixin:
# manually (branch setting)
self.SystemSettings['repositories']['branch'],
)))
return "%s%s" % (etpCache['world_update'], c_hash,)
def get_critical_updates_cache(self, db_digest = None):
libraries/entropy/client/interfaces/dep.py
+3 -3
View File
@@ -1675,7 +1675,8 @@ class CalculatorsMixin:
use_match_cache = False
continue
break
if do_continue: continue
if do_continue:
continue
# now compare
# version: cl_version
# tag: cl_tag
@@ -1749,8 +1750,7 @@ class CalculatorsMixin:
c_hash = self._get_updates_cache_hash(db_digest, empty_deps,
ignore_spm_downgrades)
data = (update, remove, fine, spm_fine,)
self.Cacher.push("%s%s" % (etpCache['world_update'], c_hash,),
data, async = False)
self.Cacher.push(c_hash, data, async = False)
self.Cacher.sync()
if not update: