| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-02 22:33:31 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10113 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Add a PackageVirtualDbapi.__iter__() method and use it to iterate over |
| 9 |
all installed packages in depgraph.validate_blockers(). (trunk r10112) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-02 22:32:01 UTC (rev 10112) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-02 22:33:31 UTC (rev 10113) |
| 16 |
@@ -1657,6 +1657,9 @@ |
| 17 |
obj._cpv_map = self._cpv_map.copy() |
| 18 |
return obj |
| 19 |
|
| 20 |
+ def __iter__(self): |
| 21 |
+ return self._cpv_map.itervalues() |
| 22 |
+ |
| 23 |
def __contains__(self, item): |
| 24 |
existing = self._cpv_map.get(item.cpv) |
| 25 |
if existing is not None and \ |
| 26 |
@@ -3265,14 +3268,12 @@ |
| 27 |
portdb = self.trees[myroot]["porttree"].dbapi |
| 28 |
pkgsettings = self.pkgsettings[myroot] |
| 29 |
final_db = self.mydbapi[myroot] |
| 30 |
- cpv_all_installed = self.trees[myroot]["vartree"].dbapi.cpv_all() |
| 31 |
blocker_cache = BlockerCache(myroot, vardb) |
| 32 |
stale_cache = set(blocker_cache) |
| 33 |
- for cpv in cpv_all_installed: |
| 34 |
+ for pkg in vardb: |
| 35 |
+ cpv = pkg.cpv |
| 36 |
stale_cache.discard(cpv) |
| 37 |
blocker_atoms = None |
| 38 |
- pkg = self._pkg_cache[ |
| 39 |
- ("installed", myroot, cpv, "nomerge")] |
| 40 |
blockers = None |
| 41 |
if self.digraph.contains(pkg): |
| 42 |
try: |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives