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

svn path=/main/trunk/; revision=6070

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"

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 5a6e2ba527e7892316f71dca7a6471b0570ee53f..572baf883e69a1590872857e22dc9a769af7558a 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -3799,7 +3799,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: