Remove the manifest1 digest filter from PORTAGE_RSYNC_OPTS since it's

no longer needed. (trunk r9260)

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

diff --git a/bin/emerge b/bin/emerge
index 0058805c70695307958002755983622805235c32..818a3703045a03fc11501e5bcccfa4d4ab74bebf 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4894,7 +4894,6 @@ 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 0395c2ae23fa9894bd1a4215e7f911640a6e2184..8fd5fc0b6a7d3b1c94f17fd27599ada45a8a97ad 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 --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 --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
 
 # Minimal CONFIG_PROTECT
 CONFIG_PROTECT="/etc"