From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 17 Feb 2007 19:30:23 +0000 (-0000)
Subject: Fix package.provided breakage from the fix for bug #166939.
X-Git-Tag: v2.2_pre1~1692
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c99dd9743bf7aaa628148d6f9644bccf5a357c77;p=portage.git

Fix package.provided breakage from the fix for bug #166939.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index e6c4cd516..96bad6761 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1522,6 +1522,10 @@ class depgraph:
 		dependencies are satisfiable. """
 		if arg:
 			mymerge = [depstring]
+			pprovided = pkgsettings.pprovideddict.get(
+				portage.dep_getkey(depstring))
+			if pprovided and portage.match_from_list(depstring, pprovided):
+				mymerge = []
 		else:
 			try:
 				if myparent and p_status == "nomerge":