summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge1
-rw-r--r--cnf/make.globals2
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index dff6898a9..7904c3cdb 100755
--- 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 d10aaf8e0..45ffea680 100644
--- 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"