diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-01-11 00:28:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-01-11 00:28:34 +0000 |
| commit | a3656f51c01628b90fc50b8bc6c72796d52eec7a (patch) | |
| tree | 16881e232c9d5e139512878284b646ffcf4d6188 | |
| parent | b1c76cdf3c4239ef17e7e44324804cff1dcabb0d (diff) | |
| download | portage-a3656f51c01628b90fc50b8bc6c72796d52eec7a.tar.gz portage-a3656f51c01628b90fc50b8bc6c72796d52eec7a.tar.bz2 portage-a3656f51c01628b90fc50b8bc6c72796d52eec7a.zip | |
Bug #204425 - Remove --delete-after from the default PORTAGE_RSYNC_OPTS.
This allows the rsync program to choose the preferred --delete algorithm,
or the user can choose one via PORTAGE_RSYNC_EXTRA_OPTS.
svn path=/main/trunk/; revision=9163
| -rw-r--r-- | cnf/make.globals | 2 | ||||
| -rw-r--r-- | pym/_emerge/__init__.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index 86a4f8f07..39d0d265c 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -57,7 +57,7 @@ PORTAGE_RSYNC_RETRIES="3" # Number of seconds rsync will wait before timing out. #RSYNC_TIMEOUT="180" -PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*" +PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*" # Minimal CONFIG_PROTECT CONFIG_PROTECT="/etc" diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index ebb1fcecf..0cc72e6d8 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5342,7 +5342,6 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): "--force", # Force deletion on non-empty dirs "--whole-file", # Don't do block transfers, only entire files "--delete", # Delete files that aren't in the master tree - "--delete-after", # Delete only after everything else is done "--stats", # Show final statistics about what was transfered "--timeout="+str(mytimeout), # IO timeout if not done in X seconds "--exclude=/distfiles", # Exclude distfiles from consideration |