summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-10-20 09:29:46 -0700
committerZac Medico <zmedico@gentoo.org>2011-10-20 09:29:46 -0700
commit273075cdf5fcd0b4756ca47860849f174f7ede57 (patch)
treeac35c2da507b0206e69d583a6a26b07ef0459482 /pym
parenta5968f7d9b1c17568fba27f7b7fd284b9431802d (diff)
downloadportage-273075cdf5fcd0b4756ca47860849f174f7ede57.tar.gz
portage-273075cdf5fcd0b4756ca47860849f174f7ede57.tar.bz2
portage-273075cdf5fcd0b4756ca47860849f174f7ede57.zip
depgraph: fix installed masked warning
This warning has been broken since commit 5f65c2294df592a6a4e0f0fff0bedec49ed3491a.
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/depgraph.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index ab62dc773..1630a72d0 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3526,18 +3526,18 @@ class depgraph(object):
return pkg, existing
- def _pkg_visibility_check(self, pkg, allow_unstable_keywords=False, allow_license_changes=False, allow_unmasks=False):
+ def _pkg_visibility_check(self, pkg, allow_unstable_keywords=False,
+ allow_license_changes=False, allow_unmasks=False, trust_graph=True):
if pkg.visible:
return True
- if pkg in self._dynamic_config.digraph:
+ if trust_graph and pkg in self._dynamic_config.digraph:
# Sometimes we need to temporarily disable
# dynamic_config._autounmask, but for overall
- # consistency in dependency resolution, in any
- # case we want to respect autounmask visibity
- # for packages that have already been added to
- # the dependency graph.
+ # consistency in dependency resolution, in most
+ # cases we want to treat packages in the graph
+ # as though they are visible.
return True
if not self._dynamic_config._autounmask:
@@ -4446,7 +4446,8 @@ class depgraph(object):
# packages masked by license, since the user likely wants
# to adjust ACCEPT_LICENSE.
if pkg in final_db:
- if not self._pkg_visibility_check(pkg) and \
+ if not self._pkg_visibility_check(pkg,
+ trust_graph=False) and \
(pkg_in_graph or 'LICENSE' in pkg.masks):
self._dynamic_config._masked_installed.add(pkg)
else: