From: Zac Medico Date: Thu, 12 Nov 2009 23:06:20 +0000 (-0000) Subject: Implement dblink.__hash__ and __eq__, so that `portageq owners` correctly groups X-Git-Tag: v2.2_rc50~7 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=366f0030e491917568a4df059e4af4c53a814301;p=portage.git Implement dblink.__hash__ and __eq__, so that `portageq owners` correctly groups search results. Also, increase iter_owners dblink cache size from 25 to 100 instances. svn path=/main/trunk/; revision=14817 --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 0be5632c1..b1d668654 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1624,7 +1624,7 @@ class vardbapi(dbapi): def dblink(cpv): x = dblink_cache.get(cpv) if x is None: - if len(dblink_fifo) >= 25: + if len(dblink_fifo) >= 100: # Ensure that we don't run out of memory. del dblink_cache[dblink_fifo.popleft().mycpv] x = self._vardb._dblink(cpv) @@ -1918,6 +1918,14 @@ class dblink(object): self._contents_basenames = None self._linkmap_broken = False self._md5_merge_map = {} + self._hash_key = (self.myroot, self.mycpv) + + def __hash__(self): + return hash(self._hash_key) + + def __eq__(self, other): + return isinstance(other, dblink) and \ + self._hash_key == other._hash_key def lockdb(self): if self._lock_vdb: