1 |
Author: zmedico |
2 |
Date: 2008-05-08 19:03:42 +0000 (Thu, 08 May 2008) |
3 |
New Revision: 10241 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Remove unnecessary BlockerDB and BlockerCache _installed_pkgs attributes. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-08 18:37:21 UTC (rev 10240) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-08 19:03:42 UTC (rev 10241) |
15 |
@@ -1383,7 +1383,6 @@ |
16 |
|
17 |
def __init__(self, myroot, vardb): |
18 |
self._vardb = vardb |
19 |
- self._installed_pkgs = set(vardb.cpv_all()) |
20 |
self._virtuals = vardb.settings.getvirtuals() |
21 |
self._cache_filename = os.path.join(myroot, |
22 |
portage.CACHE_PATH.lstrip(os.path.sep), "vdb_blockers.pickle") |
23 |
@@ -1529,7 +1528,6 @@ |
24 |
"porttree" : self._vartree, |
25 |
"vartree" : self._vartree, |
26 |
}} |
27 |
- self._installed_pkgs = None |
28 |
|
29 |
def findInstalledBlockers(self, new_pkg): |
30 |
blocker_cache = self._blocker_cache |
31 |
@@ -1541,9 +1539,9 @@ |
32 |
FakeVartree(self._vartree, |
33 |
self._portdb, Package.metadata_keys, {}) |
34 |
vardb = fake_vartree.dbapi |
35 |
- self._installed_pkgs = list(vardb) |
36 |
+ installed_pkgs = list(vardb) |
37 |
|
38 |
- for inst_pkg in self._installed_pkgs: |
39 |
+ for inst_pkg in installed_pkgs: |
40 |
stale_cache.discard(inst_pkg.cpv) |
41 |
cached_blockers = blocker_cache.get(inst_pkg.cpv) |
42 |
if cached_blockers is not None and \ |
43 |
@@ -1582,7 +1580,7 @@ |
44 |
|
45 |
blocker_parents = digraph() |
46 |
blocker_atoms = [] |
47 |
- for pkg in self._installed_pkgs: |
48 |
+ for pkg in installed_pkgs: |
49 |
for blocker_atom in self._blocker_cache[pkg.cpv].atoms: |
50 |
blocker_atom = blocker_atom[1:] |
51 |
blocker_atoms.append(blocker_atom) |
52 |
@@ -1611,7 +1609,7 @@ |
53 |
blocker_atoms = [atom[1:] for atom in atoms \ |
54 |
if atom.startswith("!")] |
55 |
blocker_atoms = InternalPackageSet(initial_atoms=blocker_atoms) |
56 |
- for inst_pkg in self._installed_pkgs: |
57 |
+ for inst_pkg in installed_pkgs: |
58 |
try: |
59 |
blocker_atoms.iterAtomsForPackage(inst_pkg).next() |
60 |
except (portage.exception.InvalidDependString, StopIteration): |
61 |
|
62 |
-- |
63 |
gentoo-commits@l.g.o mailing list |