From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Aug 2010 02:07:09 +0000 (-0700)
Subject: Use Package.visible to simplify visibility checks for installed
X-Git-Tag: v2.2_rc70~34
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=edc8f67481f1f805e311e215e5c8575aa076aba0;p=portage.git

Use Package.visible to simplify visibility checks for installed
packages, no that it accounts for invalid metadata.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index effb2e541..69ba8b2cc 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2616,17 +2616,7 @@ class depgraph(object):
 					# Make --noreplace take precedence over --newuse.
 					if not pkg.installed and noreplace and \
 						cpv in vardb.match(atom):
-						inst_pkg = self._pkg(pkg.cpv, "installed",
-							root_config, installed=True)
-						mreasons = None
-						if not inst_pkg.invalid:
-							mreasons = _get_masking_status(inst_pkg,
-								pkgsettings, root_config,
-								use=self._pkg_use_enabled(inst_pkg))
-							if mreasons and len(mreasons) == 1 and \
-								mreasons[0].category  == 'KEYWORDS':
-								mreasons = None
-						if not inst_pkg.invalid and not mreasons:
+						if inst_pkg.visible:
 							# If the installed version is masked, it may
 							# be necessary to look at lower versions,
 							# in case there is a visible downgrade.