summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/Package.py
diff options
context:
space:
mode:
authorBrian Dolbec <brian.dolbec@gmail.com>2011-01-30 12:42:44 -0800
committerZac Medico <zmedico@gentoo.org>2011-01-30 14:37:48 -0800
commitea8827f3893cc8324adbac03c6fa63398598ab01 (patch)
tree2af1630f5dd861c869979363d346171a1750ea52 /pym/_emerge/Package.py
parent757d61c4041b11b124ee8baf9c2d482e15c89cb9 (diff)
downloadportage-ea8827f3893cc8324adbac03c6fa63398598ab01.tar.gz
portage-ea8827f3893cc8324adbac03c6fa63398598ab01.tar.bz2
portage-ea8827f3893cc8324adbac03c6fa63398598ab01.zip
fix the problem of mixing "**" and ebuild keywords for only some archs
Diffstat (limited to 'pym/_emerge/Package.py')
-rw-r--r--pym/_emerge/Package.py7
1 files changed, 6 insertions, 1 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