From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 20 Nov 2006 03:35:50 +0000 (-0000)
Subject: Allow dep_wordreduce to mark things satisfied by package.provided even when mydbapi... 
X-Git-Tag: v2.1.2~443
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cdcdb9acc67fafaf1438f67132382ec3bf368beb;p=portage.git

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

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

diff --git a/pym/portage.py b/pym/portage.py
index ec92108a9..e48850fb7 100644
--- 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])