diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-09-20 13:29:42 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-20 08:11:38 -0700 |
| commit | d54430b4c2d2191d051930925e6029ec22c19baf (patch) | |
| tree | 1d3ec3151ac4e07bdddd2273425692e03640a12c /pym/_emerge | |
| parent | e1832018e84a75871c69e1d1c7779592014fa041 (diff) | |
| download | portage-d54430b4c2d2191d051930925e6029ec22c19baf.tar.gz portage-d54430b4c2d2191d051930925e6029ec22c19baf.tar.bz2 portage-d54430b4c2d2191d051930925e6029ec22c19baf.zip | |
Tests: add resolver/test_output: Make sure we don't backtrace in the merge list printer
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 29601562f..3670899de 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -411,7 +411,6 @@ class depgraph(object): if not missed_updates: return - write = sys.stderr.write backtrack_masked = [] for pkg, parent_atoms in missed_updates: @@ -425,31 +424,29 @@ class depgraph(object): backtrack_masked.append((pkg, parent_atoms)) continue - write("\n!!! The following update has been skipped " + \ - "due to unsatisfied dependencies:\n\n") + writemsg("\n!!! The following update has been skipped " + \ + "due to unsatisfied dependencies:\n\n", noiselevel=-1) - write(str(pkg.slot_atom)) + writemsg(str(pkg.slot_atom), noiselevel=-1) if pkg.root != '/': - write(" for %s" % (pkg.root,)) - write("\n") + writemsg(" for %s" % (pkg.root,), noiselevel=-1) + writemsg("\n", noiselevel=-1) for parent, root, atom in parent_atoms: self._show_unsatisfied_dep(root, atom, myparent=parent) - write("\n") + writemsg("\n", noiselevel=-1) if backtrack_masked: # These are shown in abbreviated form, in order to avoid terminal # flooding from mask messages as reported in bug #285832. - write("\n!!! The following update(s) have been skipped " + \ + writemsg("\n!!! The following update(s) have been skipped " + \ "due to unsatisfied dependencies\n" + \ - "!!! triggered by backtracking:\n\n") + "!!! triggered by backtracking:\n\n", noiselevel=-1) for pkg, parent_atoms in backtrack_masked: - write(str(pkg.slot_atom)) + writemsg(str(pkg.slot_atom), noiselevel=-1) if pkg.root != '/': - write(" for %s" % (pkg.root,)) - write("\n") - - sys.stderr.flush() + writemsg(" for %s" % (pkg.root,), noiselevel=-1) + writemsg("\n", noiselevel=-1) def _show_missed_update_slot_conflicts(self, missed_updates): @@ -485,8 +482,7 @@ class depgraph(object): msg.append("\n") msg.append("\n") - sys.stderr.write("".join(msg)) - sys.stderr.flush() + writemsg("".join(msg), noiselevel=-1) def _show_slot_collision_notice(self): """Show an informational message advising the user to mask one of the |