From cbe52e67cef86de786328d408c67c24ededb0dd0 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 25 Dec 2013 14:09:17 +0100 Subject: [PATCH] [entropy.cache] drop EntropyCacher.CACHE_IDS['filter_satisfied_deps'] --- docs/TODO | 5 ++++- lib/entropy/cache.py | 1 - lib/entropy/client/interfaces/dep.py | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/TODO b/docs/TODO index da5e7fc95..e49979c26 100644 --- a/docs/TODO +++ b/docs/TODO @@ -1,7 +1,10 @@ Short term: +- drop EntropyCacher.CACHE_IDS from entropy.client.interfaces.{dep,cache} +- disable packagekit notifications (conflict with RigoDaemon) +- settings -> fix repos_installed and repos_installed_keys, they could be stale -- entropy.client.interfaces code refactoring (including inst_repo locking) +- entropy.client.interfaces code refactoring - wrap available repositories usage around a ResourceLock, this will decrease the need for an exclusively held Entropy Resources Lock. diff --git a/lib/entropy/cache.py b/lib/entropy/cache.py index 120fd8f5f..e59bf9ee9 100644 --- a/lib/entropy/cache.py +++ b/lib/entropy/cache.py @@ -42,7 +42,6 @@ class EntropyCacher(Singleton): 'atom_search': 'atom_search/atom_search_', 'check_package_update': 'check_update/package_update_', 'depends_tree': 'depends/depends_tree_', - 'filter_satisfied_deps': 'depfilter/filter_satisfied_deps_', 'library_breakage': 'libs_break/library_breakage_', 'mask_filter': 'match/mask_filter', } diff --git a/lib/entropy/client/interfaces/dep.py b/lib/entropy/client/interfaces/dep.py index 18c87b003..6cbf34c05 100644 --- a/lib/entropy/client/interfaces/dep.py +++ b/lib/entropy/client/interfaces/dep.py @@ -659,8 +659,7 @@ class CalculatorsMixin: match_repo) sha.update(const_convert_to_rawstring(cache_s)) - cache_key = "%s_%s" % ( - EntropyCacher.CACHE_IDS['filter_satisfied_deps'], + cache_key = "unsat_deps/%s" % ( sha.hexdigest()) cached = self._cacher.pop(cache_key)