diff options
author | Brian Dolbec <brian.dolbec@gmail.com> | 2011-01-30 00:57:46 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-01-30 01:11:58 -0800 |
commit | a15f54d284e3913b1993a4d9dd2b4db7c46713b5 (patch) | |
tree | 415f15bf2969dbd2e85c58102407592119dde34f /pym/_emerge/Package.py | |
parent | 8aa975bc82b0336247f5e0891cef5a39a836f2fb (diff) | |
download | portage-a15f54d284e3913b1993a4d9dd2b4db7c46713b5.tar.gz portage-a15f54d284e3913b1993a4d9dd2b4db7c46713b5.tar.bz2 portage-a15f54d284e3913b1993a4d9dd2b4db7c46713b5.zip |
Use the new _getRawMissingKeyword() which optimizes the keyword display. Misc. whitespace cleanup
Diffstat (limited to 'pym/_emerge/Package.py')
-rw-r--r-- | pym/_emerge/Package.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index ae9e8f293..c501b1ac8 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -240,23 +240,23 @@ class Package(Task): def accepted_keyword(self): """returns the keyword used from the ebuild's KEYWORDS string""" - keywords = set(self.metadata.get('KEYWORDS').split()) - accept_keywords = set(self.root_config.settings['ACCEPT_KEYWORDS'].split()) - used_keyword = list(set.intersection(keywords, accept_keywords)) - if used_keyword and len(used_keyword) == 1: - used_keyword = used_keyword[0] - elif len(used_keyword) > 1: - # you can raise an error here if you prefer, remove it, or set the correct levels - writemsg_level( "_emerge.output.resolver.Display(), too many keywords recieved for pkg: %s, %s" - % (pkg.cpv, used_keyword)) - used_keyword = used_keyword[0] - return used_keyword + missing, _keywords = \ + self.root_config.settings._getRawMissingKeywords( + self.cpv, self.metadata) + if '**' in missing: + return '**' + if missing: # keywords to evaluate + for keyword in _keywords: + used_keyword = '~' + keyword + if used_keyword in missing: + return used_keyword + return '' def isHardMasked(self): """returns a bool if the cpv is in the list of expanded pmaskdict[cp] availble ebuilds""" - pmask = self.root_config.settings._getRawMaskAtom(self.cpv, self.metadata) - print "pmask =", pmask + pmask = self.root_config.settings._getRawMaskAtom( + self.cpv, self.metadata) return pmask is not None |