diff options
author | Brian Dolbec <brian.dolbec@gmail.com> | 2011-01-30 12:42:44 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-01-30 14:37:48 -0800 |
commit | ea8827f3893cc8324adbac03c6fa63398598ab01 (patch) | |
tree | 2af1630f5dd861c869979363d346171a1750ea52 | |
parent | 757d61c4041b11b124ee8baf9c2d482e15c89cb9 (diff) | |
download | portage-ea8827f3893cc8324adbac03c6fa63398598ab01.tar.gz portage-ea8827f3893cc8324adbac03c6fa63398598ab01.tar.bz2 portage-ea8827f3893cc8324adbac03c6fa63398598ab01.zip |
fix the problem of mixing "**" and ebuild keywords for only some archs
-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: |