From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 Oct 2006 03:25:55 +0000 (-0000)
Subject: More filtering binary package for visiblity in greedy atom handling.
X-Git-Tag: v2.1.2~587
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f3884d852303ce84922774309cacdfd35427009;p=portage.git

More filtering binary package for visiblity in greedy atom handling.

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

diff --git a/bin/emerge b/bin/emerge
index 5a65ef795..fb3d4604d 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1077,10 +1077,12 @@ class depgraph:
 							self.trees[self.target_root][
 							"porttree"].dbapi.match(myslot_atom):
 							available = True
-						elif "--usepkg" in self.myopts and \
-							self.trees[self.target_root][
-							"bintree"].dbapi.match(myslot_atom):
-							available = True
+						elif "--usepkg" in self.myopts:
+							mymatches = bindb.match(myslot_atom)
+							if "--usepkgonly" not in self.myopts:
+								mymatches = portdb.visible(mymatches)
+							if mymatches:
+								available = True
 						if available:
 							greedy_atoms.append((myarg, myslot_atom))
 			arg_atoms = greedy_atoms
@@ -1644,10 +1646,12 @@ class depgraph:
 							self.trees[self.target_root][
 							"porttree"].dbapi.match(myslot_atom):
 							available = True
-						elif "--usepkg" in self.myopts and \
-							self.trees[self.target_root][
-							"bintree"].dbapi.match(myslot_atom):
-							available = True
+						elif "--usepkg" in self.myopts:
+							mymatches = bindb.match(myslot_atom)
+							if "--usepkgonly" not in self.myopts:
+								mymatches = portdb.visible(mymatches)
+							if mymatches:
+								available = True
 						if available:
 							newlist.append(myslot_atom)
 		mylist = newlist