From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pup63-0005su-Rn for garchives@archives.gentoo.org; Wed, 02 Mar 2011 16:40:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 609FB1C04C; Wed, 2 Mar 2011 16:40:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 30A301C04C for ; Wed, 2 Mar 2011 16:40:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFCBB1B40F7 for ; Wed, 2 Mar 2011 16:40:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2139C8006A for ; Wed, 2 Mar 2011 16:40:11 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: bb320d635acb8d745dedf979075331277253167e Date: Wed, 2 Mar 2011 16:40:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a10922539657d5079fbed07d094b8a20 commit: bb320d635acb8d745dedf979075331277253167e Author: Zac Medico gentoo org> AuthorDate: Wed Mar 2 16:39:14 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 2 16:39:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dbb320d63 depgraph: don't output \b to non-tty This will fix bug #357093. --- pym/_emerge/depgraph.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b9c308b..6de3d14 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5866,10 +5866,15 @@ def _spinner_start(spinner, myopts): =20 def _spinner_stop(spinner): if spinner is None or \ - spinner.update is spinner.update_quiet: + spinner.update =3D=3D spinner.update_quiet: return =20 - portage.writemsg_stdout("\b\b... done!\n") + if spinner.update !=3D 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") =20 def backtrack_depgraph(settings, trees, myopts, myparams,=20 myaction, myfiles, spinner):