From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 6 Oct 2010 04:01:08 +0000 (-0700)
Subject: Use match-all-cpv-only in _show_unsatisfied_dep.
X-Git-Tag: v2.2_rc90~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fdb147dd0a7e0c9ee6d3d4db00e606e00478c257;p=portage.git

Use match-all-cpv-only in _show_unsatisfied_dep.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 28a7dd3b9..4540004ae 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2168,7 +2168,7 @@ class depgraph(object):
 				continue
 			match = db.match
 			if hasattr(db, "xmatch"):
-				cpv_list = db.xmatch("match-all", atom.without_use)
+				cpv_list = db.xmatch("match-all-cpv-only", atom.without_use)
 			else:
 				cpv_list = db.match(atom.without_use)
 
@@ -2192,16 +2192,12 @@ class depgraph(object):
 							repo = metadata.get('repository')
 						pkg = self._pkg(cpv, pkg_type, root_config,
 							installed=installed, myrepo=repo)
+						if not atom_set.findAtomForPackage(pkg,
+							modified_use=self._pkg_use_enabled(pkg)):
+							continue
 						# pkg.metadata contains calculated USE for ebuilds,
 						# required later for getMissingLicenses.
 						metadata = pkg.metadata
-						if pkg.cp != atom.cp:
-							# A cpv can be returned from dbapi.match() as an
-							# old-style virtual match even in cases when the
-							# package does not actually PROVIDE the virtual.
-							# Filter out any such false matches here.
-							if not atom_set.findAtomForPackage(pkg, modified_use=self._pkg_use_enabled(pkg)):
-								continue
 						if pkg in self._dynamic_config._runtime_pkg_mask:
 							backtrack_reasons = \
 								self._dynamic_config._runtime_pkg_mask[pkg]