diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-01-11 05:44:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-01-11 05:44:54 +0000 |
| commit | 217f73343bd59b601ed6b0b54438344c8feb26d8 (patch) | |
| tree | 279e37257dd724d074655056248d4beae0e051a6 | |
| parent | 0f062288df103dd217c5201c38b7b210fb8b2491 (diff) | |
| download | portage-217f73343bd59b601ed6b0b54438344c8feb26d8.tar.gz portage-217f73343bd59b601ed6b0b54438344c8feb26d8.tar.bz2 portage-217f73343bd59b601ed6b0b54438344c8feb26d8.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. (trunk r9163)
svn path=/main/branches/2.1.2/; revision=9172
| -rwxr-xr-x | bin/emerge | 1 | ||||
| -rw-r--r-- | cnf/make.globals | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 365c69a25..122e87fd1 100755 --- 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 3d814908b..0395c2ae2 100644 --- 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" |