From 61cb046eed4a21af21d8c45121ee274ec52540c0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 2 Oct 2009 20:41:13 +0000 Subject: Bug #287333 - If posible, use ebuild from tree when checking for keyword mask on installed packages. svn path=/main/trunk/; revision=14474 --- pym/_emerge/depgraph.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'pym') 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) -- cgit v1.2.3-1-g7c22