diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-02 07:23:06 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-02 07:23:06 +0000 |
commit | 64e6fa9fb79b6218e0b55bf0e6797c129a498723 (patch) | |
tree | faf2a7bb324bd68d4e81093396de120e818fcfe5 /pym/emerge/__init__.py | |
parent | fdad51fbc130f9f67e57ed9fa9c330f002d97344 (diff) | |
download | portage-64e6fa9fb79b6218e0b55bf0e6797c129a498723.tar.gz portage-64e6fa9fb79b6218e0b55bf0e6797c129a498723.tar.bz2 portage-64e6fa9fb79b6218e0b55bf0e6797c129a498723.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.
svn path=/main/trunk/; revision=6129
Diffstat (limited to 'pym/emerge/__init__.py')
-rw-r--r-- | pym/emerge/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 10dfe9d3c..33d3a330d 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -3799,7 +3799,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: @@ -4075,7 +4074,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 |