diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-06-26 17:16:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-26 17:16:07 -0700 |
| commit | c3f0895fb89c7b0647428de37eb0f893939d93f7 (patch) | |
| tree | 0a98c5bc9cd9a1170963242766c315a725577724 /pym/_emerge/resolver/output.py | |
| parent | e543f089e917e2d4029d3338238df4013d46c66a (diff) | |
| download | portage-c3f0895fb89c7b0647428de37eb0f893939d93f7.tar.gz portage-c3f0895fb89c7b0647428de37eb0f893939d93f7.tar.bz2 portage-c3f0895fb89c7b0647428de37eb0f893939d93f7.zip | |
Package: add use.expand/expand_hidden attributes
This allows the merge list display to account for repository-level
USE_EXPAND and USE_EXPAND_HIDDEN settings (see bug #370693).
Diffstat (limited to 'pym/_emerge/resolver/output.py')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 6c3579f73..69a30ccd0 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -151,11 +151,8 @@ class Display(object): self.old_use = [flag for flag in self.old_use if flag in self.old_iuse] - self.use_expand = self.pkgsettings["USE_EXPAND"].lower().split() - self.use_expand.sort() - self.use_expand.reverse() - self.use_expand_hidden = \ - self.pkgsettings["USE_EXPAND_HIDDEN"].lower().split() + self.use_expand = pkg.use.expand + self.use_expand_hidden = pkg.use.expand_hidden return def include_mask_str(self): @@ -253,10 +250,10 @@ class Display(object): old_iuse_map = self.map_to_use_expand(self.old_iuse) old_use_map = self.map_to_use_expand(self.old_use) - self.use_expand.sort() - self.use_expand.insert(0, "USE") + use_expand = sorted(self.use_expand) + use_expand.insert(0, "USE") - for key in self.use_expand: + for key in use_expand: if key in self.use_expand_hidden: continue self.verboseadd += _create_use_string(self.conf, key.upper(), |