diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-28 14:21:06 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-28 14:21:06 -0700 |
commit | 3b05d2eb59106413a923bbee0bfff5429548f722 (patch) | |
tree | 1477e435fd40bbf0cf85ec04cb1ce20faff0fcb0 /pym/_emerge/depgraph.py | |
parent | 988416d6a172458d49a787f053b8e44a22830857 (diff) | |
download | portage-3b05d2eb59106413a923bbee0bfff5429548f722.tar.gz portage-3b05d2eb59106413a923bbee0bfff5429548f722.tar.bz2 portage-3b05d2eb59106413a923bbee0bfff5429548f722.zip |
If there are circular dependencies, and circular_dependency_handler
doesn't have a message, eliminate root nodes before calling
digraph.debug_print(). If --debug is enabled then do this even if
circular_dependency_handler has a message.
Diffstat (limited to 'pym/_emerge/depgraph.py')
-rw-r--r-- | pym/_emerge/depgraph.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index eb0dfb8a2..69fe00298 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4184,9 +4184,12 @@ class depgraph(object): noiselevel=-1) portage.writemsg("\n", noiselevel=-1) - if handler.circular_dep_message is None: - mygraph.debug_print() - else: + if handler.circular_dep_message is None or \ + "--debug" in self._frozen_config.myopts: + handler.debug_print() + portage.writemsg("\n", noiselevel=-1) + + if handler.circular_dep_message is not None: portage.writemsg(handler.circular_dep_message, noiselevel=-1) suggestions = handler.suggestions |