diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:04:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:04:54 +0000 |
| commit | 77da56e871eb10f8545e7fe695335bf0029acd26 (patch) | |
| tree | 106f0677d44d70be3d37b581259e7c3739385737 | |
| parent | Bug #293448 - Fix TypeError when sending mail with python3, triggered by this (diff) | |
| download | portage-multirepo-77da56e871eb10f8545e7fe695335bf0029acd26.tar.gz portage-multirepo-77da56e871eb10f8545e7fe695335bf0029acd26.tar.bz2 portage-multirepo-77da56e871eb10f8545e7fe695335bf0029acd26.zip | |
Check for updates masked by license for any installed packages that have been
added to the graph (regardless of --deep or --complete-graph).. (trunk r14845)
svn path=/main/branches/2.1.7/; revision=14861
| -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 864afc5a..3efc3190 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: |