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

diff --git a/cnf/make.globals b/cnf/make.globals
index 86a4f8f07134703d5b425e28e116efa149c61de6..39d0d265ce0d634e588ebfe4ace03a7bc4bb0cb7 100644 (file)
--- 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 ebb1fcecf6471f837e834c953827b93a0ee3e04f..0cc72e6d813b07d6f6083de4b541878dd2292002 100644 (file)
--- 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