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

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

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"

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index c0072d2f8d15ea5606aa0d77d3feedd38a2b9366..61bd4836b1f0dc65bb723de4bbbfedc524086c81 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -3798,6 +3798,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: