| 1 |
commit: 7f6e71973505462bee44ed81b11c99e94e770cef |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 23 15:41:07 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 4 19:26:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7f6e7197 |
| 7 |
|
| 8 |
ebuild(1): fix env FEATURES overrides bug #364035 |
| 9 |
|
| 10 |
--- |
| 11 |
bin/ebuild | 6 ++---- |
| 12 |
1 files changed, 2 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/ebuild b/bin/ebuild |
| 15 |
index 58ab46f..60d0dad 100755 |
| 16 |
--- a/bin/ebuild |
| 17 |
+++ b/bin/ebuild |
| 18 |
@@ -248,11 +248,9 @@ if "test" in pargs: |
| 19 |
# of problems such as masked "test" USE flag. |
| 20 |
tmpsettings["EBUILD_FORCE_TEST"] = "1" |
| 21 |
tmpsettings.backup_changes("EBUILD_FORCE_TEST") |
| 22 |
- tmpsettings["FEATURES"] = tmpsettings.get("FEATURES", "") + " " + "test" |
| 23 |
- tmpsettings.backup_changes("FEATURES") |
| 24 |
+ tmpsettings.features.add("test") |
| 25 |
|
| 26 |
-tmpsettings["FEATURES"] = tmpsettings.get("FEATURES", "") + " " + "-fail-clean" |
| 27 |
-tmpsettings.backup_changes("FEATURES") |
| 28 |
+tmpsettings.features.discard("fail-clean") |
| 29 |
|
| 30 |
# Apply package.env settings. This allows per-package FEATURES and other |
| 31 |
# variables (possibly PORTAGE_TMPDIR) to be available as soon as possible. |
Archives