diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-17 02:41:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-17 02:41:44 +0000 |
| commit | f8623855371f9027070b75b831ca25dcf36616ae (patch) | |
| tree | b822c5eb06110c90ed6f449f6cbd0dbe56171749 | |
| parent | Bug #293448 - Fix TypeError when sending mail with python3, triggered by this (diff) | |
| download | portage-f8623855371f9027070b75b831ca25dcf36616ae.tar.gz portage-f8623855371f9027070b75b831ca25dcf36616ae.tar.bz2 portage-f8623855371f9027070b75b831ca25dcf36616ae.zip | |
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
| -rw-r--r-- | pym/_emerge/depgraph.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2d950124f..ed4ffada7 100644 --- 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: |