From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Dec 2008 23:39:59 +0000 (-0000)
Subject: Fix depgraph._dep_check_composite_db._visible() to reject installed packages
X-Git-Tag: v2.1.6_rc3~9
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0c34bd4ee8c73291605c70288ce0516ce4a3a3c7;p=portage.git

Fix depgraph._dep_check_composite_db._visible() to reject installed packages
that are masked. This is necessary for correct choices in || deps when we
want to ensure that installed masked packages are not preferred over other
available choices that are not masked. Thanks to Jan Kundrát <jkt@g.o> for
reporting this issue and testing the patch. (trunk r12138)

svn path=/main/branches/2.1.6/; revision=12139
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 7f1f846da..daed4789e 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8201,13 +8201,13 @@ class depgraph(object):
 					arg = None
 				if arg:
 					return False
-				if pkg.installed:
-					try:
-						if not visible(
-							self._depgraph.pkgsettings[pkg.root], pkg):
-							return False
-					except portage.exception.InvalidDependString:
-						pass
+			if pkg.installed:
+				try:
+					if not visible(
+						self._depgraph.pkgsettings[pkg.root], pkg):
+						return False
+				except portage.exception.InvalidDependString:
+					pass
 			return True
 
 		def _dep_expand(self, atom):