Allow dep_wordreduce to mark things satisfied by package.provided even when mydbapi...

svn path=/main/trunk/; revision=5093

diff --git a/pym/portage.py b/pym/portage.py
index ec92108a9195e82b6e5dcd0895de1f36ebb5181a..e48850fb750541e83cf7928284a330af214421b7 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3801,15 +3801,16 @@ def dep_wordreduce(mydeplist,mysettings,mydbapi,mode,use_cache=1):
                        deplist[mypos]=dep_wordreduce(deplist[mypos],mysettings,mydbapi,mode,use_cache=use_cache)
                elif deplist[mypos]=="||":
                        pass
-               elif mydbapi is None:
-                       # Assume nothing is satisfied.  This forces dep_zapdeps to return
-                       # all of deps the deps that have been selected.
-                       deplist[mypos] = False
                else:
                        mykey = dep_getkey(deplist[mypos])
                        if mysettings and mysettings.pprovideddict.has_key(mykey) and \
                                match_from_list(deplist[mypos], mysettings.pprovideddict[mykey]):
                                deplist[mypos]=True
+                       elif mydbapi is None:
+                               # Assume nothing is satisfied.  This forces dep_zapdeps to
+                               # return all of deps the deps that have been selected
+                               # (excluding those satisfied by package.provided).
+                               deplist[mypos] = False
                        else:
                                if mode:
                                        mydep=mydbapi.xmatch(mode,deplist[mypos])