summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-03-02 08:39:14 -0800
committerZac Medico <zmedico@gentoo.org>2011-03-02 08:39:14 -0800
commitbb320d635acb8d745dedf979075331277253167e (patch)
tree38838247a7234138f261fb8eb3d5712ccde69282
parent37f44e5dd11f5ec524578377198e6f736093d282 (diff)
downloadportage-bb320d635acb8d745dedf979075331277253167e.tar.gz
portage-bb320d635acb8d745dedf979075331277253167e.tar.bz2
portage-bb320d635acb8d745dedf979075331277253167e.zip
depgraph: don't output \b to non-tty
This will fix bug #357093.
-rw-r--r--pym/_emerge/depgraph.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index b9c308bca..6de3d1430 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5866,10 +5866,15 @@ def _spinner_start(spinner, myopts):
def _spinner_stop(spinner):
if spinner is None or \
- spinner.update is spinner.update_quiet:
+ spinner.update == spinner.update_quiet:
return
- portage.writemsg_stdout("\b\b... done!\n")
+ if spinner.update != spinner.update_basic:
+ # update_basic is used for non-tty output,
+ # so don't output backspaces in that case.
+ portage.writemsg_stdout("\b\b")
+
+ portage.writemsg_stdout("... done!\n")
def backtrack_depgraph(settings, trees, myopts, myparams,
myaction, myfiles, spinner):