summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-01-02 13:10:42 -0800
committerZac Medico <zmedico@gentoo.org>2011-01-02 15:16:42 -0800
commit1225285f62aef9fff6e7bd36c7efda4e990b6468 (patch)
treec182454eb83d7dd5061d8e00800fda17e0e80750
parenta1b9829d910a6a7ad7bee51615b7ab4e3323c588 (diff)
downloadportage-1225285f62aef9fff6e7bd36c7efda4e990b6468.tar.gz
portage-1225285f62aef9fff6e7bd36c7efda4e990b6468.tar.bz2
portage-1225285f62aef9fff6e7bd36c7efda4e990b6468.zip
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.
-rw-r--r--pym/_emerge/depgraph.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d570b28fe..dab23451e 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5361,7 +5361,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)