diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-08 20:50:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-08 20:50:53 +0000 |
| commit | d120da04d7ddbdc76d6bdd8f4c3720d71c87f870 (patch) | |
| tree | 59c6ff59656398627969ff95f884fb9f485e8b0a | |
| parent | 6d1a76edd04bcab9319c6e4605978ea73c5dd42d (diff) | |
| download | portage-d120da04d7ddbdc76d6bdd8f4c3720d71c87f870.tar.gz portage-d120da04d7ddbdc76d6bdd8f4c3720d71c87f870.tar.bz2 portage-d120da04d7ddbdc76d6bdd8f4c3720d71c87f870.zip | |
Make system/world less greedy for bug #150251.
svn path=/main/trunk/; revision=4619
| -rwxr-xr-x | bin/emerge | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 662c2dc0c..f927ae3bf 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1392,7 +1392,18 @@ class depgraph: myslots.add(vardb.aux_get(cpv, ["SLOT"])[0]) if len(myslots) > 1: for myslot in myslots: - newlist.append("%s:%s" % (mykey, myslot)) + myslot_atom = "%s:%s" % (mykey, myslot) + available = False + if "--usepkgonly" not in self.myopts and \ + 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 + if available: + newlist.append(myslot_atom) mylist = newlist missing_atoms = [] |