summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-20 03:35:50 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-20 03:35:50 +0000
commitcdcdb9acc67fafaf1438f67132382ec3bf368beb (patch)
tree57b9cf0d03ba11630c840560462064252e461fa3
parent89f4b744cbfaf440d8c781033313a220276bde13 (diff)
downloadportage-cdcdb9acc67fafaf1438f67132382ec3bf368beb.tar.gz
portage-cdcdb9acc67fafaf1438f67132382ec3bf368beb.tar.bz2
portage-cdcdb9acc67fafaf1438f67132382ec3bf368beb.zip
Allow dep_wordreduce to mark things satisfied by package.provided even when mydbapi is None.
svn path=/main/trunk/; revision=5093
-rw-r--r--pym/portage.py9
1 files changed, 5 insertions, 4 deletions
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])