diff options
| -rw-r--r-- | pym/_emerge/Package.py | 7 | ||||
| -rw-r--r-- | pym/_emerge/resolver/output.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index bf0219261..9f210570d 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -243,10 +243,15 @@ class Package(Task): missing, _keywords = \ self.root_config.settings._getRawMissingKeywords( self.cpv, self.metadata) + unmasks = self.root_config.settings._getPKeywords( + self.cpv, self.metadata) + if '**' in missing: return '**' if missing: # keywords to evaluate - for keyword in _keywords: + for keyword in _keywords + unmasks: + if keyword == '**': + return keyword used_keyword = '~' + keyword if used_keyword in missing: return used_keyword diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 51d9d3cad..ffee6dab3 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -165,7 +165,7 @@ class Display(object): """ used_keyword = pkg.accepted_keyword() hardmasked = pkg.isHardMasked() - if used_keyword not in self.pkgsettings['ACCEPT_KEYWORDS'] or hardmasked: + if used_keyword not in self.pkgsettings['ACCEPT_KEYWORDS'].split() or hardmasked: if hardmasked: self.verboseadd += 'keyword=' + red('[%s] ' % used_keyword) else: |