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. (trunk r9163)

svn path=/main/branches/2.1.2/; revision=9172

diff --git a/bin/emerge b/bin/emerge
index 365c69a25f7d54c9d89ac2bbd0eac3deed1d2450..122e87fd11c13b38e7df5a25036624d07b9dab77 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4886,7 +4886,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

diff --git a/cnf/make.globals b/cnf/make.globals
index 3d814908b6574b64ef843367d5868823e0eb7de2..0395c2ae23fa9894bd1a4215e7f911640a6e2184 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -54,7 +54,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"