summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-02 07:23:06 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-02 07:23:06 +0000
commit64e6fa9fb79b6218e0b55bf0e6797c129a498723 (patch)
treefaf2a7bb324bd68d4e81093396de120e818fcfe5
parentfdad51fbc130f9f67e57ed9fa9c330f002d97344 (diff)
downloadportage-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
-rw-r--r--cnf/make.globals2
-rw-r--r--pym/emerge/__init__.py3
2 files changed, 2 insertions, 3 deletions
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"
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