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 <gentoo-commits+bounces-361867-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QgIWl-0004Lg-TO
for garchives@archives.gentoo.org; Mon, 11 Jul 2011 15:36:08 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A2F8D21C01F;
Mon, 11 Jul 2011 15:35:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 5B9F721C01F
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Jul 2011 15:35:59 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B2A1B1CC010
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Jul 2011 15:35:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id D41318003D
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Jul 2011 15:35:57 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <02c20ea840829e48c072015eb6d5d89ce3caca1d.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/_emerge/EbuildPhase.py
X-VCS-Directories: pym/_emerge/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 02c20ea840829e48c072015eb6d5d89ce3caca1d
Date: Mon, 11 Jul 2011 15:35:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: b0a8a1abcf526a057cbd7449ce59e437
commit: 02c20ea840829e48c072015eb6d5d89ce3caca1d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 15:35:38 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 15:35:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D02c20ea8
Log maintainer info for pretend and nofetch.
Also, suppress this maintainer info from going to stdout since it's
intended for the log and it doesn't necessarily need to be visible
elsewhere. This will fix bug #374809.
---
pym/_emerge/EbuildPhase.py | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 954c033..64d33a8 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -61,7 +61,7 @@ class EbuildPhase(CompositeTask):
except OSError:
pass
=20
- if self.phase =3D=3D 'setup':
+ if self.phase in ('nofetch', 'pretend', 'setup'):
=20
use =3D self.settings.get('PORTAGE_BUILT_USE')
if use is None:
@@ -97,7 +97,11 @@ class EbuildPhase(CompositeTask):
relevant_features.append(x)
if relevant_features:
msg.append("FEATURES: %s" % " ".join(relevant_features))
- self._elog('einfo', msg)
+
+ # Force background=3DTrue for this header since it's intended
+ # for the log and it doesn't necessarily need to be visible
+ # elsewhere.
+ self._elog('einfo', msg, background=3DTrue)
=20
if self.phase =3D=3D 'package':
if 'PORTAGE_BINPKG_TMPFILE' not in self.settings:
@@ -326,7 +330,9 @@ class EbuildPhase(CompositeTask):
self.returncode =3D 1
self.wait()
=20
- def _elog(self, elog_funcname, lines):
+ def _elog(self, elog_funcname, lines, background=3DNone):
+ if background is None:
+ background =3D self.background
out =3D StringIO()
phase =3D self.phase
elog_func =3D getattr(elog_messages, elog_funcname)
@@ -344,4 +350,5 @@ class EbuildPhase(CompositeTask):
log_path =3D None
if self.settings.get("PORTAGE_BACKGROUND") !=3D "subprocess":
log_path =3D self.settings.get("PORTAGE_LOG_FILE")
- self.scheduler.output(msg, log_path=3Dlog_path)
+ self.scheduler.output(msg, log_path=3Dlog_path,
+ background=3Dbackground)