From 2a2b9e6485950757c59a1d5aa026d7f875311def Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 31 Jan 2011 02:01:48 -0800 Subject: Display: Simplify mask code for bug #58416. Hopefully this makes the logic more understandable, though it may support fewer cases. If we want to handle more cases then hopefully we can do it without making the code too complex. --- pym/_emerge/resolver/output.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pym/_emerge/resolver') diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index be07656a4..46e22808a 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -164,16 +164,17 @@ class Display(object): """ @param pkg: _emerge.Package instance """ - used_keyword = pkg.accepted_keyword() hardmasked = pkg.isHardMasked() mask_str = " " if hardmasked: mask_str = colorize("BAD", "#") - elif not used_keyword: - pass - elif used_keyword not in self.pkgsettings['ACCEPT_KEYWORDS'].split(): - if used_keyword == "**": + else: + keyword_mask = pkg.get_keyword_mask() + + if keyword_mask is None: + pass + elif keyword_mask == "missing": mask_str = colorize("BAD", "*") else: mask_str = colorize("WARN", "~") -- cgit v1.2.3-1-g7c22