Fix package.provided breakage from the fix for bug #166939.
authorZac Medico <zmedico@gentoo.org>
Sat, 17 Feb 2007 19:30:23 +0000 (19:30 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 17 Feb 2007 19:30:23 +0000 (19:30 -0000)
svn path=/main/trunk/; revision=5984

pym/emerge/__init__.py

index e6c4cd516ab150093f4737c1aaa20145abddb849..96bad676148160ff2e1aabab935e19e27fbd6d49 100644 (file)
@@ -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":