From c99dd9743bf7aaa628148d6f9644bccf5a357c77 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 17 Feb 2007 19:30:23 +0000 Subject: Fix package.provided breakage from the fix for bug #166939. svn path=/main/trunk/; revision=5984 --- pym/emerge/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) 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": -- cgit v1.2.3-1-g7c22