| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-25 05:09:25 +0000 (Tue, 25 Aug 2009) |
| 3 |
New Revision: 14155 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/depgraph.py |
| 7 |
Log: |
| 8 |
Inside depgraph._show_unsatisfied_dep(), show reasons for packages masked due |
| 9 |
to backtracking. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/depgraph.py 2009-08-24 21:37:30 UTC (rev 14154) |
| 15 |
+++ main/trunk/pym/_emerge/depgraph.py 2009-08-25 05:09:25 UTC (rev 14155) |
| 16 |
@@ -1891,9 +1891,8 @@ |
| 17 |
metadata, mreasons = get_mask_info(root_config, cpv, |
| 18 |
pkgsettings, db, pkg_type, built, installed, db_keys) |
| 19 |
if metadata is not None: |
| 20 |
- pkg = Package(built=built, cpv=cpv, |
| 21 |
- installed=installed, metadata=metadata, |
| 22 |
- root_config=root_config) |
| 23 |
+ pkg = self._pkg(cpv, pkg_type, root_config, |
| 24 |
+ installed=installed) |
| 25 |
if pkg.cp != atom.cp: |
| 26 |
# A cpv can be returned from dbapi.match() as an |
| 27 |
# old-style virtual match even in cases when the |
| 28 |
@@ -1901,6 +1900,11 @@ |
| 29 |
# Filter out any such false matches here. |
| 30 |
if not atom_set.findAtomForPackage(pkg): |
| 31 |
continue |
| 32 |
+ if pkg in self._dynamic_config._runtime_pkg_mask: |
| 33 |
+ backtrack_reasons = \ |
| 34 |
+ self._dynamic_config._runtime_pkg_mask[pkg] |
| 35 |
+ mreasons.append('backtracking: %s' % \ |
| 36 |
+ ', '.join(sorted(backtrack_reasons))) |
| 37 |
if mreasons: |
| 38 |
masked_pkg_instances.add(pkg) |
| 39 |
if atom.use: |
Archives