diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-22 02:56:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-22 02:56:51 +0000 |
| commit | 06750592dcbc9dbddceb10d821d26c4a7ca9a519 (patch) | |
| tree | 54fbd5c412b04391ff58356078c28064d6ae3f14 | |
| parent | 8829466443c5bb58cc180331ae5586c94eef36d4 (diff) | |
| download | portage-06750592dcbc9dbddceb10d821d26c4a7ca9a519.tar.gz portage-06750592dcbc9dbddceb10d821d26c4a7ca9a519.tar.bz2 portage-06750592dcbc9dbddceb10d821d26c4a7ca9a519.zip | |
Fix visibility checks so that binary packages aren't masked just because there is no matching ebuild in the tree.
svn path=/main/trunk/; revision=4788
| -rwxr-xr-x | bin/emerge | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 7acc3500b..86a26b7f2 100755 --- a/bin/emerge +++ b/bin/emerge @@ -967,7 +967,9 @@ class depgraph: pkgsettings = self.pkgsettings[myroot] arg_atoms = [] def visible(mylist): - return portdb.gvisible(portdb.visible(mylist)) + matches = portdb.gvisible(portdb.visible(mylist)) + return [x for x in mylist \ + if x in matches or not portdb.cpv_exists(x)] for x in myfiles: ext = os.path.splitext(x)[1] if ext==".tbz2": @@ -1569,7 +1571,9 @@ class depgraph: portdb = self.trees[self.target_root]["porttree"].dbapi bindb = self.trees[self.target_root]["bintree"].dbapi def visible(mylist): - return portdb.gvisible(portdb.visible(mylist)) + matches = portdb.gvisible(portdb.visible(mylist)) + return [x for x in mylist \ + if x in matches or not portdb.cpv_exists(x)] world_problems = False if mode=="system": mylist = getlist(self.settings, "system") |