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