diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-06-07 20:11:45 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-12 01:17:24 -0700 |
| commit | b55d1f658ea6de26329f5c65388e5fb87e3ee38f (patch) | |
| tree | 190949aad31df653f3aa66432453d560404d3363 /pym/_emerge/depgraph.py | |
| parent | 30d4d5dabaf09454a92cf71dd30be9ff1c5c707e (diff) | |
| download | portage-b55d1f658ea6de26329f5c65388e5fb87e3ee38f.tar.gz portage-b55d1f658ea6de26329f5c65388e5fb87e3ee38f.tar.bz2 portage-b55d1f658ea6de26329f5c65388e5fb87e3ee38f.zip | |
slot_collision_handler: Return a string instead of priting the messages to screen.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 12 |
1 files changed, 9 insertions, 3 deletions
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 = [] |