summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-21 03:25:55 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-21 03:25:55 +0000
commit8f3884d852303ce84922774309cacdfd35427009 (patch)
tree98ee9b6ac9cd34c87d88ce127b3ddbbda4a6ac6e
parent05a0a37a18fd316b0671ee887256686db92669d6 (diff)
downloadportage-8f3884d852303ce84922774309cacdfd35427009.tar.gz
portage-8f3884d852303ce84922774309cacdfd35427009.tar.bz2
portage-8f3884d852303ce84922774309cacdfd35427009.zip
More filtering binary package for visiblity in greedy atom handling.
svn path=/main/trunk/; revision=4775
-rwxr-xr-xbin/emerge20
1 files changed, 12 insertions, 8 deletions
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