diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-21 12:17:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-21 12:17:24 +0000 |
| commit | 9bcd977e479eb8e8ec691ef6d9b78fe5485aaff4 (patch) | |
| tree | 42f2ecf32ea6d45228dde6efa46c066adfbde6b5 | |
| parent | 21c322f2efb9d9b2fb35658b8c369c15f06a03f1 (diff) | |
| download | portage-9bcd977e479eb8e8ec691ef6d9b78fe5485aaff4.tar.gz portage-9bcd977e479eb8e8ec691ef6d9b78fe5485aaff4.tar.bz2 portage-9bcd977e479eb8e8ec691ef6d9b78fe5485aaff4.zip | |
Also check keyword visibility via gvisible.
svn path=/main/trunk/; revision=4783
| -rwxr-xr-x | bin/emerge | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index ad42e3fb7..7acc3500b 100755 --- a/bin/emerge +++ b/bin/emerge @@ -966,6 +966,8 @@ class depgraph: bindb = self.trees[myroot]["bintree"].dbapi pkgsettings = self.pkgsettings[myroot] arg_atoms = [] + def visible(mylist): + return portdb.gvisible(portdb.visible(mylist)) for x in myfiles: ext = os.path.splitext(x)[1] if ext==".tbz2": @@ -1057,7 +1059,7 @@ class depgraph: if "--usepkg" in self.myopts: mymatches = bindb.match(myatom) if "--usepkgonly" not in self.myopts: - mymatches = portdb.visible(mymatches) + mymatches = visible(mymatches) best_pkg = portage.best(mymatches) if best_pkg: best_slot = bindb.aux_get(best_pkg, ["SLOT"])[0] @@ -1084,7 +1086,7 @@ class depgraph: elif "--usepkg" in self.myopts: mymatches = bindb.match(myslot_atom) if "--usepkgonly" not in self.myopts: - mymatches = portdb.visible(mymatches) + mymatches = visible(mymatches) if mymatches: available = True if available: @@ -1566,6 +1568,8 @@ class depgraph: vardb = self.trees[self.target_root]["vartree"].dbapi 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)) world_problems = False if mode=="system": mylist = getlist(self.settings, "system") @@ -1603,7 +1607,7 @@ class depgraph: if "--usepkg" in self.myopts: mymatches = bindb.match(atom) if "--usepkgonly" not in self.myopts: - mymatches = portdb.visible(mymatches) + mymatches = visible(mymatches) best_pkg = portage.best(mymatches) if best_pkg: best_slot = bindb.aux_get(best_pkg, ["SLOT"])[0] @@ -1629,7 +1633,7 @@ class depgraph: elif "--usepkg" in self.myopts: mymatches = bindb.match(myslot_atom) if "--usepkgonly" not in self.myopts: - mymatches = portdb.visible(mymatches) + mymatches = visible(mymatches) if mymatches: available = True if available: |