diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild | 12 | ||||
| -rwxr-xr-x | bin/egencache | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/bin/ebuild b/bin/ebuild index 3600881f3..9ce058b5c 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -220,15 +220,9 @@ if "test" in pargs: # of problems such as masked "test" USE flag. tmpsettings["EBUILD_FORCE_TEST"] = "1" tmpsettings.backup_changes("EBUILD_FORCE_TEST") - if "test" not in tmpsettings.features: - tmpsettings.features.add("test") - tmpsettings["FEATURES"] = " ".join(sorted(tmpsettings.features)) - tmpsettings.backup_changes("FEATURES") - -if 'fail-clean' in tmpsettings.features: - tmpsettings.features.remove('fail-clean') - tmpsettings["FEATURES"] = " ".join(sorted(tmpsettings.features)) - tmpsettings.backup_changes("FEATURES") + tmpsettings.features.add("test") + +tmpsettings.features.discard('fail-clean') if opts.skip_manifest: tmpsettings["EBUILD_SKIP_MANIFEST"] = "1" diff --git a/bin/egencache b/bin/egencache index c078d98a7..0d9c4858d 100755 --- a/bin/egencache +++ b/bin/egencache @@ -327,8 +327,6 @@ def egencache_main(args): "automatically enabling FEATURES=metadata-transfer\n", level=logging.WARNING, noiselevel=-1) settings.features.add('metadata-transfer') - settings['FEATURES'] = ' '.join(sorted(settings.features)) - settings.backup_changes('FEATURES') settings.lock() |