[gentoo-commits] portage r14474 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-10-02 20:41:13 +0000 (Fri, 02 Oct 2009)
New Revision: 14474

Modified:
   main/trunk/pym/_emerge/depgraph.py
Log:
Bug #287333 - If posible, use ebuild from tree when checking for keyword mask
on installed packages.


Modified: main/trunk/pym/_emerge/depgraph.py
===================================================================
--- main/trunk/pym/_emerge/depgraph.py	2009-10-02 20:40:28 UTC (rev 14473)
+++ main/trunk/pym/_emerge/depgraph.py	2009-10-02 20:41:13 UTC (rev 14474)
@@ -2332,18 +2332,17 @@
 									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)