For bug #167668, prune empty ${FILESDIR}s by adding --prune-empty-dirs to PORTAGE_RS...

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

diff --git a/bin/emerge b/bin/emerge
index b9a3fa6bf29e1cdb0d0f4902bdfdc4f8c8a1ca39..9ae4beb78b6c36dd5491484fc578cb647099ecaf 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3738,7 +3738,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                                "--exclude=/distfiles",   # Exclude distfiles from consideration
                                "--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
+                               "--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:

diff --git a/cnf/make.globals b/cnf/make.globals
index 45ffea6800959dbd797713849d31e27830235c48..13ec1b751991c89b6f24aaa7ade226a0a19e44d3 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-*"
+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"
 
 # Minimal CONFIG_PROTECT
 CONFIG_PROTECT="/etc"