summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge9
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 87f287301..c74d949ff 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -168,8 +168,13 @@ if portage.settings.has_key("PORTAGE_NICENESS"):
portage.portdb.freeze()
# Kill noauto as it will break merges otherwise.
-while 'noauto' in portage.settings.features:
- portage.settings.features.remove('noauto')
+if "noauto" in portage.settings.features:
+ while "noauto" in portage.settings.features:
+ portage.settings.features.remove("noauto")
+ portage.settings.unlock()
+ portage.settings["FEATURES"] = " ".join(portage.settings.features)
+ portage.settings.backup_changes("FEATURES")
+ portage.settings.lock()
#number of ebuilds merged
merged=0