Make the post-sync metadata-transfer a FEATURE so that it can be optionally disabled.

svn path=/main/trunk/; revision=2788

diff --git a/bin/emerge b/bin/emerge
index c94f5bd9d91f2c64f82cfdc8bbec8e74e6ff1979..6dcf1ea61ab7fdc44f8afe6f3c144c9185df78ba 100755 (executable)
--- 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 cd34f8447652a771b0e4fa18e122d62b405b7d5f..52d06abf2474160236420001d9bd0a6a1bf458c8 100644 (file)
--- 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"