Check for updates masked by license for any installed packages that have been

added to the graph (regardless of --deep or --complete-graph)..

svn path=/main/trunk/; revision=14845

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2d950124f28426a85ef80fe283e0c2e228e19070..ed4ffada7b86d5e92c65d29c54d33841980ad554 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2810,11 +2810,12 @@ class depgraph(object):
                                                        self._dynamic_config._masked_installed.add(pkg)
                                                elif pkgsettings._getMissingLicenses(pkg.cpv, pkg.metadata):
                                                        self._dynamic_config._masked_installed.add(pkg)
-                                               elif complete or deep:
+                                               elif pkg_in_graph or complete or deep:
                                                        # Check for upgrades in the same slot that are
                                                        # masked due to a LICENSE change in a newer
                                                        # version that is not masked for any other reason.
-                                                       # Only do this for complete or deep graphs since
+                                                       # Only do this for packages that are already in
+                                                       # the graph, or complete or deep graphs, since
                                                        # otherwise it is likely a waste of time.
                                                        got_mask = False
                                                        for db, pkg_type, built, installed, db_keys in dbs: