From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 2 Jan 2011 21:10:42 +0000 (-0800)
Subject: depclean: account for more masks
X-Git-Tag: v2.2.0_alpha12~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7de3d1fb10e40b4ef03462f8a145968689ac587;p=portage.git

depclean: account for more masks

Account for packages with masks (like KEYWORDS masks) that are usually
ignored in visibility checks for installed packages, in order to
handle cases like bug #350285.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index a11094448..2ab027cfa 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5426,7 +5426,12 @@ class _dep_check_composite_db(dbapi):
 				arg = None
 			if arg:
 				return False
-		if pkg.installed and not self._depgraph._pkg_visibility_check(pkg):
+		if pkg.installed and \
+			(pkg.masks or not self._depgraph._pkg_visibility_check(pkg)):
+			# Account for packages with masks (like KEYWORDS masks)
+			# that are usually ignored in visibility checks for
+			# installed packages, in order to handle cases like
+			# bug #350285.
 			return False
 		in_graph = self._depgraph._dynamic_config._slot_pkg_map[
 			self._root].get(pkg.slot_atom)