From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 6 Jul 2009 07:15:01 +0000 (-0000)
Subject: Use PackageSet.findAtomForPackage() when matching the existing node against
X-Git-Tag: v2.2_rc34~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6e900218ccf1acf7003c2b35a76317efc64ec8d;p=portage.git

Use PackageSet.findAtomForPackage() when matching the existing node against
the atom inside _select_pkg_highest_available_imp(), for PROVIDE support.

svn path=/main/trunk/; revision=13794
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 5bc4275fa..c02e50ca4 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2000,6 +2000,7 @@ class depgraph(object):
 		if not isinstance(atom, portage.dep.Atom):
 			atom = portage.dep.Atom(atom)
 		atom_cp = atom.cp
+		atom_set = InternalPackageSet(initial_atoms=(atom,))
 		existing_node = None
 		myeb = None
 		usepkgonly = "--usepkgonly" in self._frozen_config.myopts
@@ -2135,7 +2136,9 @@ class depgraph(object):
 						e_pkg = self._dynamic_config._slot_pkg_map[root].get(pkg.slot_atom)
 						if not e_pkg:
 							break
-						if portage.dep.match_from_list(atom, [e_pkg]):
+						# Use PackageSet.findAtomForPackage()
+						# for PROVIDE support.
+						if atom_set.findAtomForPackage(e_pkg):
 							if highest_version and \
 								e_pkg.cp == atom_cp and \
 								e_pkg < highest_version and \