diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-02 07:26:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-02 07:26:37 +0000 |
| commit | 2837443df0d03426acbf0b3656e331d5313b7c78 (patch) | |
| tree | 3270954591c91b3285084adbfd172a42bed69aa8 | |
| parent | 64c6caf986cb15c76f8f76341893decffc3aa7a2 (diff) | |
| download | portage-2837443df0d03426acbf0b3656e331d5313b7c78.tar.gz portage-2837443df0d03426acbf0b3656e331d5313b7c78.tar.bz2 portage-2837443df0d03426acbf0b3656e331d5313b7c78.zip | |
For bug #168646, remove --prune-empty-dirs from PORTAGE_RSYNC_OPTS since it's only a small optimization and it's inconvenient to force >=rsync-2.6.4 on server admins at this time. If users desire, they can still add it to PORTAGE_RSYNC_EXTRA_OPTS. (trunk r6128:6129)
svn path=/main/branches/2.1.2/; revision=6130
| -rwxr-xr-x | bin/emerge | 3 | ||||
| -rw-r--r-- | cnf/make.globals | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index b9c49d6d9..5f23b0ce8 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3738,7 +3738,6 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): "--exclude=/local", # Exclude local from consideration "--exclude=/packages", # Exclude packages from consideration "--filter=H_**/files/digest-*", # Exclude manifest1 digests and delete on the receiving side - "--prune-empty-dirs" # Prune empty ${FILESDIR} when manifest1 digests are excluded ]) else: @@ -4015,7 +4014,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): # Code 2 indicates protocol incompatibility, which is expected # for servers with protocol < 29 that don't support # --prune-empty-directories. Retry for a server that supports - # at least rsync protocol version 29 (>=rsync-2.6.7). + # at least rsync protocol version 29 (>=rsync-2.6.4). pass retries=retries+1 diff --git a/cnf/make.globals b/cnf/make.globals index 13ec1b751..45ffea680 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-* --prune-empty-dirs" +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-*" # Minimal CONFIG_PROTECT CONFIG_PROTECT="/etc" |