ebuild(1): fix env FEATURES overrides bug #364035
authorZac Medico <zmedico@gentoo.org>
Sat, 23 Apr 2011 15:41:07 +0000 (08:41 -0700)
committerZac Medico <zmedico@gentoo.org>
Sat, 23 Apr 2011 15:41:07 +0000 (08:41 -0700)
bin/ebuild

index d6cdc666c4b11073eb6b4caecad11b1191ee0da3..e3e8c6b347d2f17638e6fd270f06d5b98b31bbf4 100755 (executable)
@@ -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.