summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-11-15 23:54:23 +0000
committerZac Medico <zmedico@gentoo.org>2009-11-15 23:54:23 +0000
commit8a11ca966112d1a17f503e3db9f7aac36625c382 (patch)
treead5add04c1af2bc054330e230aac341fc7009955
parentBug #288083 - Always warn about installed packages masked by license, since (diff)
downloadportage-8a11ca966112d1a17f503e3db9f7aac36625c382.tar.gz
portage-8a11ca966112d1a17f503e3db9f7aac36625c382.tar.bz2
portage-8a11ca966112d1a17f503e3db9f7aac36625c382.zip
In the code from bug #288083, only show one LICENSE masking message per slot.
svn path=/main/trunk/; revision=14823
-rw-r--r--pym/_emerge/depgraph.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index fe0276818..2d950124f 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2816,9 +2816,12 @@ class depgraph(object):
# version that is not masked for any other reason.
# Only do this for 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:
if installed:
continue
+ if got_mask:
+ break
for upgrade_pkg in self._iter_match_pkgs(
root_config, pkg_type, pkg.slot_atom):
if upgrade_pkg <= pkg:
@@ -2829,6 +2832,7 @@ class depgraph(object):
if pkgsettings._getMissingLicenses(
upgrade_pkg.cpv, upgrade_pkg.metadata):
self._dynamic_config._masked_license_updates.add(upgrade_pkg)
+ got_mask = True
break
blocker_atoms = None