From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 23 Apr 2011 15:41:07 +0000 (-0700)
Subject: ebuild(1): fix env FEATURES overrides bug #364035
X-Git-Tag: v2.1.9.47~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f6e71973505462bee44ed81b11c99e94e770cef;p=portage.git

ebuild(1): fix env FEATURES overrides bug #364035
---

diff --git a/bin/ebuild b/bin/ebuild
index 58ab46f13..60d0dadef 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -248,11 +248,9 @@ if "test" in pargs:
 	# of problems such as masked "test" USE flag.
 	tmpsettings["EBUILD_FORCE_TEST"] = "1"
 	tmpsettings.backup_changes("EBUILD_FORCE_TEST")
-	tmpsettings["FEATURES"] = tmpsettings.get("FEATURES", "") + " " + "test"
-	tmpsettings.backup_changes("FEATURES")
+	tmpsettings.features.add("test")
 
-tmpsettings["FEATURES"] = tmpsettings.get("FEATURES", "") + " " + "-fail-clean"
-tmpsettings.backup_changes("FEATURES")
+tmpsettings.features.discard("fail-clean")
 
 # Apply package.env settings. This allows per-package FEATURES and other
 # variables (possibly PORTAGE_TMPDIR) to be available as soon as possible.