For bug #167668, use an rsync "hide" filter rule to exclude **/files/digest-* and...

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

diff --git a/bin/emerge b/bin/emerge
index dff6898a941f5d4e6ba2f0b3efddb14af0adcc8b..7904c3cdbff3315f41f641aaa92d41dd5ffa60e2 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3737,6 +3737,7 @@ 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
                        ])
 
                else:

diff --git a/cnf/make.globals b/cnf/make.globals
index d10aaf8e07eacf670684d6e8c315fd569f8e40cc..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"
+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"