diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-04-23 08:41:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-04-23 08:41:07 -0700 |
| commit | 9f9763896a887d375a59b167f96019a3c0a0b9bc (patch) | |
| tree | 3bd736d37a73874e7b01c4575106df8d4b3aeeda /bin | |
| parent | repoman: deprecate more eclasses (diff) | |
| download | portage-9f9763896a887d375a59b167f96019a3c0a0b9bc.tar.gz portage-9f9763896a887d375a59b167f96019a3c0a0b9bc.tar.bz2 portage-9f9763896a887d375a59b167f96019a3c0a0b9bc.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 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. |