| 1 |
Author: zmedico |
| 2 |
Date: 2009-01-23 21:15:34 +0000 (Fri, 23 Jan 2009) |
| 3 |
New Revision: 12552 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Inside depgraph._dep_expand(), filter use dbapi.cp_list() to filter out |
| 9 |
any results from dbapi.cp_all() that happen to not contain any ebuilds. |
| 10 |
Thanks to Jeremy Olexa <darkside@g.o> for reporting. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2009-01-22 22:26:49 UTC (rev 12551) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2009-01-23 21:15:34 UTC (rev 12552) |
| 17 |
@@ -5179,9 +5179,9 @@ |
| 18 |
atom_without_category, "null")) |
| 19 |
cat, atom_pn = portage.catsplit(null_cp) |
| 20 |
|
| 21 |
+ dbs = self._filtered_trees[root_config.root]["dbs"] |
| 22 |
cp_set = set() |
| 23 |
- for db, pkg_type, built, installed, db_keys in \ |
| 24 |
- self._filtered_trees[root_config.root]["dbs"]: |
| 25 |
+ for db, pkg_type, built, installed, db_keys in dbs: |
| 26 |
cp_set.update(db.cp_all()) |
| 27 |
for cp in list(cp_set): |
| 28 |
cat, pn = portage.catsplit(cp) |
| 29 |
@@ -5189,6 +5189,13 @@ |
| 30 |
cp_set.discard(cp) |
| 31 |
deps = [] |
| 32 |
for cp in cp_set: |
| 33 |
+ have_pkg = False |
| 34 |
+ for db, pkg_type, built, installed, db_keys in dbs: |
| 35 |
+ if db.cp_list(cp): |
| 36 |
+ have_pkg = True |
| 37 |
+ break |
| 38 |
+ if not have_pkg: |
| 39 |
+ continue |
| 40 |
cat, pn = portage.catsplit(cp) |
| 41 |
deps.append(insert_category_into_atom( |
| 42 |
atom_without_category, cat)) |
Archives