summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-18 03:48:53 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-18 03:48:53 -0700
commitc86d7614083539325184dd70828cdbad39525d8c (patch)
tree7cf234011f9c2fce3f3193d5fc439d223d1759b6
parentcatch another case where using EROOT is absolutely not correct: (diff)
downloadportage-c86d7614083539325184dd70828cdbad39525d8c.tar.gz
portage-c86d7614083539325184dd70828cdbad39525d8c.tar.bz2
portage-c86d7614083539325184dd70828cdbad39525d8c.zip
Fix the "Unmatch removal atoms" (second try) to show the correct
number of undisplayed atoms when there are more than 3.
-rw-r--r--pym/portage/util/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index fed229a5d..9542826b2 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -271,9 +271,10 @@ def stack_lists(lists, incremental=1, remember_source_file=False,
if warn_for_unmatched_removal:
for source_file, tokens in unmatched_removals.items():
- if len(tokens) > 4:
+ if len(tokens) > 3:
selected = [tokens.pop(), tokens.pop(), tokens.pop()]
- writemsg(_("--- Unmatch removal atoms in %s: %s and %s more\n") % (source_file, ", ".join(selected), len(tokens)-3),
+ writemsg(_("--- Unmatch removal atoms in %s: %s and %s more\n") % \
+ (source_file, ", ".join(selected), len(tokens)),
noiselevel=-1)
else:
writemsg(_("--- Unmatch removal atom(s) in %s: %s\n") % (source_file, ", ".join(tokens)),