diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-22 16:49:46 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-22 16:49:46 -0700 |
| commit | c5142aadedee5b1917607f10d5018b763ef2419b (patch) | |
| tree | a3487b3dd4931e13c6cad556cf09064f24a073d5 /pym/_emerge/depgraph.py | |
| parent | d1a59831eb2a5205d050884c760cca1d73be8fdf (diff) | |
| download | portage-c5142aadedee5b1917607f10d5018b763ef2419b.tar.gz portage-c5142aadedee5b1917607f10d5018b763ef2419b.tar.bz2 portage-c5142aadedee5b1917607f10d5018b763ef2419b.zip | |
Enable /etc/portage/sets for stable, bug #384061.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2547fa4e4..92c10611f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -74,6 +74,9 @@ from _emerge.resolver.output import Display if sys.hexversion >= 0x3000000: basestring = str long = int + _unicode = str +else: + _unicode = unicode class _scheduler_graph_config(object): def __init__(self, trees, pkg_cache, graph, mergelist): @@ -6719,9 +6722,13 @@ class depgraph(object): all_added.extend(added_favorites) all_added.sort() for a in all_added: + if a.startswith(SETPREFIX): + filename = "world_sets" + else: + filename = "world" writemsg_stdout( - ">>> Recording %s in \"world\" favorites file...\n" % \ - colorize("INFORM", str(a)), noiselevel=-1) + ">>> Recording %s in \"%s\" favorites file...\n" % + (colorize("INFORM", _unicode(a)), filename), noiselevel=-1) if all_added: world_set.update(all_added) |