summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-11-16 00:35:16 +0000
committerZac Medico <zmedico@gentoo.org>2009-11-16 00:35:16 +0000
commitd044913b9a7a931148625c92276816580c9a0c61 (patch)
treecf84fb29e53010f097ec8d721af26a06f3e0a9d5
parent05eb7b6b18c890dc52faa9858ded25bacb7086eb (diff)
downloadportage-d044913b9a7a931148625c92276816580c9a0c61.tar.gz
portage-d044913b9a7a931148625c92276816580c9a0c61.tar.bz2
portage-d044913b9a7a931148625c92276816580c9a0c61.zip
In the code from bug #288083, only show one LICENSE masking message per slot.
(trunk r14823) svn path=/main/branches/2.1.7/; revision=14840
-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 c750d24f8..864afc5a6 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