From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 6 Aug 2010 23:01:06 +0000 (-0700)
Subject: Delay variable definitions in _pkg_visibility_check until
X-Git-Tag: v2.2_rc68~375
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c4935f8cdd27736ea2d6c82609a4d041419b70e;p=portage.git

Delay variable definitions in _pkg_visibility_check until
they are needed.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d765055ba..31f984d59 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2554,8 +2554,7 @@ class depgraph(object):
 		return pkg, existing
 
 	def _pkg_visibility_check(self, pkg, allow_missing_keywords=False):
-		pkgsettings = self._frozen_config.pkgsettings[pkg.root]
-		root_config = self._frozen_config.roots[pkg.root]
+
 		if pkg.visible:
 			return True
 
@@ -2566,6 +2565,9 @@ class depgraph(object):
 
 		if not allow_missing_keywords:
 			return False
+
+		pkgsettings = self._frozen_config.pkgsettings[pkg.root]
+		root_config = self._frozen_config.roots[pkg.root]
 		mreasons = _get_masking_status(pkg, pkgsettings, root_config)
 		if len(mreasons) == 1 and \
 			mreasons[0].hint == 'unstable keyword':