diff options
author | Brian Dolbec <brian.dolbec@gmail.com> | 2011-01-29 01:53:36 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-01-30 01:11:58 -0800 |
commit | 6fbb1c1c70ba82a2a06531e69b9851bf01c42e12 (patch) | |
tree | 7cfa562350c8a0c524fc1886d2168f68b93829ab /pym/_emerge/resolver | |
parent | 13f280f27b455b59ee387e7515a1ccf7b5510d11 (diff) | |
download | portage-6fbb1c1c70ba82a2a06531e69b9851bf01c42e12.tar.gz portage-6fbb1c1c70ba82a2a06531e69b9851bf01c42e12.tar.bz2 portage-6fbb1c1c70ba82a2a06531e69b9851bf01c42e12.zip |
Move most of the code to _emerge's Package object. Refine the hardmasking code, optimizing as much as possible.
Diffstat (limited to 'pym/_emerge/resolver')
-rw-r--r-- | pym/_emerge/resolver/output.py | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 4b90e9dd5..f1af30b25 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -163,39 +163,20 @@ class Display(object): @param pkg: _emerge.Package instance Modifies self.verboseadd """ - accept_keywords = set(self.portdb.settings['ACCEPT_KEYWORDS'].split()) - keywords = set(self.portdb.aux_get(pkg.cpv, ["KEYWORDS"])[0].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)) - try: - pmask = self.portdb.settings.pmaskdict[pkg.cp] - except KeyError: - pmask = [] - hardmasked = [] - for x in pmask: - m = self.portdb.xmatch("match-all",x) - for n in m: - if n not in hardmasked: - hardmasked.append(n) - + used_keyword = pkg.accepted_keyword() + hardmasked = pkg.isHardMasked() text = '' if '~' in used_keyword: text = used_keyword elif not used_keyword: text = '**' if text: - if pkg.cpv in hardmasked: + if hardmasked: self.verboseadd += red('%s ' % text) else: self.verboseadd += yellow('%s ' % text) return - def map_to_use_expand(self, myvals, forced_flags=False, remove_hidden=True): """Map use expand variables |