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-338534-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QDeyN-0008L1-5j
for garchives@archives.gentoo.org; Sat, 23 Apr 2011 15:42:15 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D4D5B1C013;
Sat, 23 Apr 2011 15:42:07 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 9F3241C013
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Apr 2011 15:42:07 +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 163941B4015
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Apr 2011 15:42:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 436E580380
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Apr 2011 15:42:06 +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: <9f9763896a887d375a59b167f96019a3c0a0b9bc.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/ebuild
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 9f9763896a887d375a59b167f96019a3c0a0b9bc
Date: Sat, 23 Apr 2011 15:42:06 +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: 66b3b8637513865dee13819f6173f8d4
commit: 9f9763896a887d375a59b167f96019a3c0a0b9bc
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 15:41:07 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 15:41:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D9f976389
ebuild(1): fix env FEATURES overrides bug #364035
---
bin/ebuild | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/bin/ebuild b/bin/ebuild
index d6cdc66..e3e8c6b 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -250,11 +250,9 @@ if "test" in pargs:
# of problems such as masked "test" USE flag.
tmpsettings["EBUILD_FORCE_TEST"] =3D "1"
tmpsettings.backup_changes("EBUILD_FORCE_TEST")
- tmpsettings["FEATURES"] =3D tmpsettings.get("FEATURES", "") + " " + "te=
st"
- tmpsettings.backup_changes("FEATURES")
+ tmpsettings.features.add("test")
=20
-tmpsettings["FEATURES"] =3D tmpsettings.get("FEATURES", "") + " " + "-fa=
il-clean"
-tmpsettings.backup_changes("FEATURES")
+tmpsettings.features.discard("fail-clean")
=20
# Apply package.env settings. This allows per-package FEATURES and other
# variables (possibly PORTAGE_TMPDIR) to be available as soon as possibl=
e.