[patch] patch for portage.py

portage.py.patch (text/plain), 769 bytes, created by Daniel Harding on 2003-11-04 20:30:59 UTC

--- portage.py.org	2003-11-04 20:38:18.000000000 -0600
+++ portage.py	2003-11-04 22:08:07.000000000 -0600
@@ -2514,7 +2514,25 @@
 			#deps satisfied, return None
 			return None
 		else:
-			#try to satisfy first dep
+			#try to find an installed dep
+			mydbapi=vardbapi(root)
+			x=1
+			while x<len(reduced):
+				if (type(reduced[x])==types.ListType):
+					myresult=dep_zapdeps(unreduced[x], reduced[x])
+					if myresult:
+						chk=1
+						for y in flatten(myresult):
+							if (not mydbapi.match(y)):
+								chk=0
+						if chk==1:
+							return myresult
+				else:
+					if (mydbapi.match(unreduced[x])):
+						return unreduced[x]
+				x+=1
+			
+			#none of the deps installed, use the first one
 			return unreduced[1]
 	else:
 		if dep_eval(reduced):