From e0a87f32467aaaf1db54ac4772f52c4de4ac42e8 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 26 Feb 2006 10:08:53 +0000
Subject: Make the post-sync metadata-transfer a FEATURE so that it can be
 optionally disabled.

svn path=/main/trunk/; revision=2788
---
 bin/emerge       | 3 +++
 cnf/make.globals | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/emerge b/bin/emerge
index c94f5bd9d..6dcf1ea61 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2713,6 +2713,9 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
 	except:
 		pass
 
+	if updatecache_flg and "metadata-transfer" not in portage.settings.features:
+		updatecache_flg = False
+
 	if os.path.exists(myportdir+"/metadata/cache") and updatecache_flg:
 		if "--quiet" not in myopts:
 			print "\n>>> Updating Portage cache:      ",
diff --git a/cnf/make.globals b/cnf/make.globals
index cd34f8447..52d06abf2 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -33,7 +33,7 @@ FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
 RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
 
 # Default user options
-FEATURES="sandbox distlocks"
+FEATURES="sandbox distlocks metadata-transfer"
 
 # Default chunksize for binhost comms
 PORTAGE_BINHOST_CHUNKSIZE="3000"
-- 
cgit v1.2.3-1-g7c22