diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-04-23 08:41:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-04 12:26:13 -0700 |
| commit | 7f6e71973505462bee44ed81b11c99e94e770cef (patch) | |
| tree | 11d9a730616aa893e4435374f6c70f39c8a58359 /bin | |
| parent | 10f913eab2dcbc02a2e2fcd7c453c7b3e43f5868 (diff) | |
| download | portage-7f6e71973505462bee44ed81b11c99e94e770cef.tar.gz portage-7f6e71973505462bee44ed81b11c99e94e770cef.tar.bz2 portage-7f6e71973505462bee44ed81b11c99e94e770cef.zip | |
ebuild(1): fix env FEATURES overrides bug #364035
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild | 6 |
1 files changed, 2 insertions, 4 deletions
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. |