Bug #287333 - If posible, use ebuild from tree when checking for keyword mask

on installed packages.

svn path=/main/trunk/; revision=14474

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2d47fd4675f477b139fe6051311f53028c9a0329..47da7f725f31c61e0107d5d736f2879010878de2 100644 (file)
--- 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)