| 1 |
commit: bb320d635acb8d745dedf979075331277253167e |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 2 16:39:14 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 2 16:39:14 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bb320d63 |
| 7 |
|
| 8 |
depgraph: don't output \b to non-tty |
| 9 |
|
| 10 |
This will fix bug #357093. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/_emerge/depgraph.py | 9 +++++++-- |
| 14 |
1 files changed, 7 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 17 |
index b9c308b..6de3d14 100644 |
| 18 |
--- a/pym/_emerge/depgraph.py |
| 19 |
+++ b/pym/_emerge/depgraph.py |
| 20 |
@@ -5866,10 +5866,15 @@ def _spinner_start(spinner, myopts): |
| 21 |
|
| 22 |
def _spinner_stop(spinner): |
| 23 |
if spinner is None or \ |
| 24 |
- spinner.update is spinner.update_quiet: |
| 25 |
+ spinner.update == spinner.update_quiet: |
| 26 |
return |
| 27 |
|
| 28 |
- portage.writemsg_stdout("\b\b... done!\n") |
| 29 |
+ if spinner.update != spinner.update_basic: |
| 30 |
+ # update_basic is used for non-tty output, |
| 31 |
+ # so don't output backspaces in that case. |
| 32 |
+ portage.writemsg_stdout("\b\b") |
| 33 |
+ |
| 34 |
+ portage.writemsg_stdout("... done!\n") |
| 35 |
|
| 36 |
def backtrack_depgraph(settings, trees, myopts, myparams, |
| 37 |
myaction, myfiles, spinner): |
Archives