From 48c8cec7c079cb07a4f421a36cdc46a7fdbc7811 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Wed, 22 Dec 2010 13:31:08 -0800 Subject: Refactor depgraph merge list display code. --- pym/_emerge/depgraph.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pym/_emerge/depgraph.py') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 45a450df1..76c1cb4ee 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -55,7 +55,7 @@ from _emerge.UnmergeDepPriority import UnmergeDepPriority from _emerge.resolver.backtracking import Backtracker, BacktrackParameter from _emerge.resolver.slot_collision import slot_conflict_handler from _emerge.resolver.circular_dependency import circular_dependency_handler -from _emerge.resolver.output import display, filter_iuse_defaults +from _emerge.resolver.output import Display, filter_iuse_defaults if sys.hexversion >= 0x3000000: basestring = str @@ -1024,10 +1024,10 @@ class depgraph(object): self._add_parent_atom(pkg, parent_atom) """ This section determines whether we go deeper into dependencies or not. - We want to go deeper on a few occasions: - Installing package A, we need to make sure package A's deps are met. - emerge --deep ; we need to recursively check dependencies of pkgspec - If we are in --nodeps (no recursion) mode, we obviously only check 1 level of dependencies. + We want to go deeper on a few occasions: + Installing package A, we need to make sure package A's deps are met. + emerge --deep ; we need to recursively check dependencies of pkgspec + If we are in --nodeps (no recursion) mode, we obviously only check 1 level of dependencies. """ if arg_atoms: depth = 0 @@ -4718,6 +4718,7 @@ class depgraph(object): # redundantly displaying this exact same merge list # again via _show_merge_list(). self._dynamic_config._displayed_list = mylist + display = Display() return display(self, mylist, favorites, verbosity) -- cgit v1.2.3-1-g7c22