diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-02-26 10:08:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-02-26 10:08:53 +0000 |
| commit | e0a87f32467aaaf1db54ac4772f52c4de4ac42e8 (patch) | |
| tree | 816725b03a3812b02675789e77456770a06cb974 | |
| parent | e36d804f7c78a6c429520e410aa367b79e7c4a84 (diff) | |
| download | portage-e0a87f32467aaaf1db54ac4772f52c4de4ac42e8.tar.gz portage-e0a87f32467aaaf1db54ac4772f52c4de4ac42e8.tar.bz2 portage-e0a87f32467aaaf1db54ac4772f52c4de4ac42e8.zip | |
Make the post-sync metadata-transfer a FEATURE so that it can be optionally disabled.
svn path=/main/trunk/; revision=2788
| -rwxr-xr-x | bin/emerge | 3 | ||||
| -rw-r--r-- | cnf/make.globals | 2 |
2 files changed, 4 insertions, 1 deletions
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" |