From b55d1f658ea6de26329f5c65388e5fb87e3ee38f Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Mon, 7 Jun 2010 20:11:45 +0200 Subject: slot_collision_handler: Return a string instead of priting the messages to screen. --- pym/_emerge/depgraph.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pym/_emerge/depgraph.py') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 5b075f378..effa6d382 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -472,10 +472,16 @@ class depgraph(object): handler = slot_conflict_handler(self._dynamic_config._slot_collision_info, \ self._dynamic_config._parent_atoms, self._frozen_config.myopts) - handler.print_conflict() - has_explanation = handler.print_explanation() - if has_explanation or "--quiet" in self._frozen_config.myopts: + conflict = handler.get_conflict() + writemsg(conflict, noiselevel=-1) + + explanation = handler.get_explanation() + if explanation: + writemsg(explanation, noiselevel=-1) + return + + if "--quiet" in self._frozen_config.myopts: return msg = [] -- cgit v1.2.3-1-g7c22