| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-25 07:18:36 +0000 (Wed, 25 Jun 2008) |
| 3 |
New Revision: 10777 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Remove the BlockerDB._blocker_cache attribute and just create new |
| 9 |
instances on demand instead of taking space on the heap. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-25 06:38:15 UTC (rev 10776) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-25 07:18:36 UTC (rev 10777) |
| 16 |
@@ -1682,15 +1682,14 @@ |
| 17 |
self._root_config = root_config |
| 18 |
self._vartree = root_config.trees["vartree"] |
| 19 |
self._portdb = root_config.trees["porttree"].dbapi |
| 20 |
- self._blocker_cache = \ |
| 21 |
- BlockerCache(self._vartree.root, self._vartree.dbapi) |
| 22 |
+ |
| 23 |
self._dep_check_trees = { self._vartree.root : { |
| 24 |
"porttree" : self._vartree, |
| 25 |
"vartree" : self._vartree, |
| 26 |
}} |
| 27 |
|
| 28 |
def findInstalledBlockers(self, new_pkg, acquire_lock=0): |
| 29 |
- blocker_cache = self._blocker_cache |
| 30 |
+ blocker_cache = BlockerCache(self._vartree.root, self._vartree.dbapi) |
| 31 |
dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"] |
| 32 |
dep_check_trees = self._dep_check_trees |
| 33 |
settings = self._vartree.settings |
| 34 |
@@ -1739,7 +1738,7 @@ |
| 35 |
blocker_parents = digraph() |
| 36 |
blocker_atoms = [] |
| 37 |
for pkg in installed_pkgs: |
| 38 |
- for blocker_atom in self._blocker_cache[pkg.cpv].atoms: |
| 39 |
+ for blocker_atom in blocker_cache[pkg.cpv].atoms: |
| 40 |
blocker_atom = blocker_atom[1:] |
| 41 |
blocker_atoms.append(blocker_atom) |
| 42 |
blocker_parents.add(blocker_atom, pkg) |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives