diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-02 20:41:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-02 20:41:13 +0000 |
| commit | 61cb046eed4a21af21d8c45121ee274ec52540c0 (patch) | |
| tree | dc72981172277c238b625d5fbb49da0221bfd6d9 /pym/_emerge | |
| parent | f256c18f010f075803753c440eff05c9d0ad5258 (diff) | |
| download | portage-61cb046eed4a21af21d8c45121ee274ec52540c0.tar.gz portage-61cb046eed4a21af21d8c45121ee274ec52540c0.tar.bz2 portage-61cb046eed4a21af21d8c45121ee274ec52540c0.zip | |
Bug #287333 - If posible, use ebuild from tree when checking for keyword mask
on installed packages.
svn path=/main/trunk/; revision=14474
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2d47fd467..47da7f725 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2332,18 +2332,17 @@ class depgraph(object): different_version = avail_pkg break if different_version is not None: - - if installed and \ - pkgsettings._getMissingKeywords( - pkg.cpv, pkg.metadata): - continue - # If the ebuild no longer exists or it's # keywords have been dropped, reject built # instances (installed or binary). # If --usepkgonly is enabled, assume that # the ebuild status should be ignored. - if not usepkgonly: + if usepkgonly: + if installed and \ + pkgsettings._getMissingKeywords( + pkg.cpv, pkg.metadata): + continue + else: try: pkg_eb = self._pkg( pkg.cpv, "ebuild", root_config) |