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 1PqP5q-0004Y5-NO for garchives@archives.gentoo.org; Fri, 18 Feb 2011 12:05:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4C531C036; Fri, 18 Feb 2011 12:05:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B6D471C036 for ; Fri, 18 Feb 2011 12:05:38 +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 3FE791B401E for ; Fri, 18 Feb 2011 12:05:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 85A618006A for ; Fri, 18 Feb 2011 12:05:37 +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/BinpkgVerifier.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b65b63b49c77e8b55adc6aec2ec2c7ea1a7afff8 Date: Fri, 18 Feb 2011 12:05:37 +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: bc98cf83ddeaf4bbacb7f651ea661949 commit: b65b63b49c77e8b55adc6aec2ec2c7ea1a7afff8 Author: Zac Medico gentoo org> AuthorDate: Fri Feb 18 12:05:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Feb 18 12:05:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db65b63b4 BinpkgVerifier: disable color in background mode --- pym/_emerge/BinpkgVerifier.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.p= y index 6c71977..379c862 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from _emerge.AsynchronousTask import AsynchronousTask @@ -26,11 +26,14 @@ class BinpkgVerifier(AsynchronousTask): rval =3D os.EX_OK stdout_orig =3D sys.stdout stderr_orig =3D sys.stderr + global_havecolor =3D portage.output.havecolor out =3D portage.StringIO() file_exists =3D True try: sys.stdout =3D out sys.stderr =3D out + if portage.output.havecolor: + portage.output.havecolor =3D not self.background try: bintree.digestCheck(pkg) except portage.exception.FileNotFound: @@ -61,6 +64,7 @@ class BinpkgVerifier(AsynchronousTask): finally: sys.stdout =3D stdout_orig sys.stderr =3D stderr_orig + portage.output.havecolor =3D global_havecolor =20 msg =3D _unicode_decode(out.getvalue(), encoding=3D_encodings['content'], errors=3D'replace')