For bug #168646, remove --prune-empty-dirs from PORTAGE_RSYNC_OPTS since it's only...

svn path=/main/branches/2.1.2/; revision=6130

diff --git a/bin/emerge b/bin/emerge
index b9c49d6d9d63b569aec253713e914324d4e1fdf3..5f23b0ce89c7ae54a2e19718dec487be4d4a7158 100755 (executable)
--- 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 13ec1b751991c89b6f24aaa7ade226a0a19e44d3..45ffea6800959dbd797713849d31e27830235c48 100644 (file)
--- 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"