summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-08-24 21:57:28 +0000
committerZac Medico <zmedico@gentoo.org>2007-08-24 21:57:28 +0000
commita73108b11135f3512d4b4e8f8fea107d8d9cd486 (patch)
tree26f937e70d49d753a1e301cfefe0ef6530bc29f2
parent92103e7b2eb5a70e24e3517a55197b20d2e49af6 (diff)
downloadportage-a73108b11135f3512d4b4e8f8fea107d8d9cd486.tar.gz
portage-a73108b11135f3512d4b4e8f8fea107d8d9cd486.tar.bz2
portage-a73108b11135f3512d4b4e8f8fea107d8d9cd486.zip
Don't cache results from match_from_list() since *dbapi.match() caches do the job.
svn path=/main/trunk/; revision=7694
-rw-r--r--pym/portage/dep.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index fec15332f..da0bb6427 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -629,8 +629,6 @@ def best_match_to_list(mypkg, mylist):
bestm = x
return bestm
-_match_from_list_cache = {}
-
def match_from_list(mydep, candidate_list):
"""
Searches list for entries that matches the package.
@@ -643,12 +641,6 @@ def match_from_list(mydep, candidate_list):
@return: A list of package atoms that match the given package atom
"""
- global _match_from_list_cache
- cache_key = (mydep, tuple(candidate_list))
- mylist = _match_from_list_cache.get(cache_key, None)
- if mylist is not None:
- return mylist[:]
-
from portage.util import writemsg
if mydep[0] == "!":
mydep = mydep[1:]
@@ -752,5 +744,4 @@ def match_from_list(mydep, candidate_list):
continue
mylist.append(x)
- _match_from_list_cache[cache_key] = mylist
- return mylist[:]
+ return mylist