From 9f9763896a887d375a59b167f96019a3c0a0b9bc Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 23 Apr 2011 08:41:07 -0700 Subject: ebuild(1): fix env FEATURES overrides bug #364035 --- bin/ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/ebuild b/bin/ebuild index d6cdc666c..e3e8c6b34 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"] = "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. -- cgit v1.2.3-1-g7c22