diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-01-28 14:19:59 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-28 14:19:59 -0800 |
| commit | 446c10bf9e83a583a1b8efe59253fb3f3c4f54ca (patch) | |
| tree | 07c5e4c85c444bfec6bd6babac0cfc461c4bc329 | |
| parent | 44809c14de087f87ee0fa9c5a21ec94e4787c3ce (diff) | |
| download | portage-446c10bf9e83a583a1b8efe59253fb3f3c4f54ca.tar.gz portage-446c10bf9e83a583a1b8efe59253fb3f3c4f54ca.tar.bz2 portage-446c10bf9e83a583a1b8efe59253fb3f3c4f54ca.zip | |
action_info: use _ENABLE_SET_CONFIG for sets
| -rw-r--r-- | pym/_emerge/actions.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index c88ef9222..b763e08d8 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -29,7 +29,7 @@ from portage import digraph from portage import _unicode_decode from portage.cache.cache_errors import CacheError from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH -from portage.const import _ENABLE_DYN_LINK_MAP +from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_SET_CONFIG from portage.dbapi.dep_expand import dep_expand from portage.dep import Atom, extended_cp_match from portage.exception import InvalidAtom @@ -1389,11 +1389,13 @@ def action_info(settings, trees, myopts, myfiles): writemsg_stdout("Repositories: %s\n" % \ " ".join(repo.name for repo in repos)) - world_set = root_config.sets['selected'] - sets_line = "Installed sets: " - sets_line += ", ".join(s for s in sorted(world_set) if s.startswith(SETPREFIX)) - sets_line += "\n" - writemsg_stdout(sets_line) + if _ENABLE_SET_CONFIG: + sets_line = "Installed sets: " + sets_line += ", ".join(s for s in \ + sorted(root_config.sets['selected'].getNonAtoms()) \ + if s.startswith(SETPREFIX)) + sets_line += "\n" + writemsg_stdout(sets_line) if "--verbose" in myopts: myvars = list(settings) |