From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 2 Jan 2011 10:01:43 +0000 (-0800)
Subject: depgraph: use Package.masks for installed
X-Git-Tag: v2.2.0_alpha12~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ad883d5ca22bbbb843c065217780a6b89b8e6de;p=portage.git

depgraph: use Package.masks for installed

In some cases we do special masking checks for installed packages,
and Package.masks is a convenient way to do it.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 736a40447..a11094448 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2598,8 +2598,8 @@ class depgraph(object):
 		pkg, existing = ret
 		if pkg is not None:
 			settings = pkg.root_config.settings
-			if self._pkg_visibility_check(pkg) and not (pkg.installed and \
-				settings._getMissingKeywords(pkg.cpv, pkg.metadata)):
+			if self._pkg_visibility_check(pkg) and \
+				not (pkg.installed and pkg.masks):
 				self._dynamic_config._visible_pkgs[pkg.root].cpv_inject(pkg)
 		return ret
 
@@ -2933,9 +2933,7 @@ class depgraph(object):
 								# If --usepkgonly is enabled, assume that
 								# the ebuild status should be ignored.
 								if not use_ebuild_visibility and usepkgonly:
-									if installed and \
-										pkgsettings._getMissingKeywords(
-										pkg.cpv, pkg.metadata):
+									if pkg.installed and pkg.masks:
 										continue
 								else:
 									try: