[gentoo-commits] proj/portage:multilib commit in: pym/_emerge/resolver/, pym/_emerge/

[Thomas Sachau]

commit:     ea8827f3893cc8324adbac03c6fa63398598ab01
Author:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Sun Jan 30 20:42:44 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 22:37:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ea8827f3

fix the problem of mixing "**" and ebuild keywords for only some archs

---
 pym/_emerge/Package.py         |    7 ++++++-
 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 bf02192..9f21057 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 51d9d3c..ffee6da 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: