From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 31 Mar 2009 23:10:05 +0000 (-0000)
Subject: Automatically enable FEATURES=metadata-transfer if it's not enabled,
X-Git-Tag: v2.2_rc29~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c13a2840a41766716f76bc6a0dc4bb3fa3dfa20;p=portage.git

Automatically enable FEATURES=metadata-transfer if it's not enabled,
instead of bailing out.

svn path=/main/trunk/; revision=13265
---

diff --git a/bin/egencache b/bin/egencache
index 4d0f5c9a1..3c4894612 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -243,10 +243,14 @@ def egencache_main(args):
 		target_root='/', env=env)
 
 	if 'metadata-transfer' not in settings.features:
-		writemsg_level("ecachegen: error: " + \
-			"FEATURES=metadata-transfer is not enabled\n",
-			level=logging.ERROR, noiselevel=-1)
-		return 1
+		writemsg_level("ecachegen: warning: " + \
+			"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()
 
 	portdb = portage.portdbapi(settings["PORTDIR"], mysettings=settings)