summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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