_pkg_visibility_check: if in graph then visible
authorZac Medico <zmedico@gentoo.org>
Wed, 18 May 2011 04:37:08 +0000 (21:37 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 26 May 2011 03:16:30 +0000 (20:16 -0700)
pym/_emerge/depgraph.py

index 2d0ad82fe728193a291a4cd3436f5bdc0df2cbe0..e6f9b1284e2a0d41e97fd33d2fe4dec80b9084cb 100644 (file)
@@ -3023,7 +3023,16 @@ class depgraph(object):
                if pkg.visible:
                        return True
 
-               if self._frozen_config.myopts.get('--autounmask', 'n') is not True:
+               if 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.
+                       return True
+
+               if not self._dynamic_config._autounmask:
                        return False
 
                pkgsettings = self._frozen_config.pkgsettings[pkg.root]