diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-24 17:24:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-24 17:24:34 +0000 |
| commit | d4a1deee19e89cda930ef15cbe2d73984d7867cf (patch) | |
| tree | dabc5bd6d454c5a7b3738467b5022143f8e0b872 | |
| parent | 10beb1a08a7a745f8dae67415bc9511bf77fba46 (diff) | |
| download | portage-d4a1deee19e89cda930ef15cbe2d73984d7867cf.tar.gz portage-d4a1deee19e89cda930ef15cbe2d73984d7867cf.tar.bz2 portage-d4a1deee19e89cda930ef15cbe2d73984d7867cf.zip | |
Update code for removing noauto from FEATURES since config.features is a
set instead of a list now.
svn path=/main/trunk/; revision=13178
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index f951a8a57..04695cf8a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -14920,9 +14920,8 @@ def adjust_config(myopts, settings): # Kill noauto as it will break merges otherwise. if "noauto" in settings.features: - while "noauto" in settings.features: - settings.features.remove("noauto") - settings["FEATURES"] = " ".join(settings.features) + settings.features.remove('noauto') + settings['FEATURES'] = ' '.join(sorted(settings.features)) settings.backup_changes("FEATURES") CLEAN_DELAY = 5 |