diff options
| -rw-r--r-- | cnf/make.globals | 2 | ||||
| -rw-r--r-- | pym/emerge/__init__.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index 45ffea680..13ec1b751 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 --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 5a6e2ba52..572baf883 100644 --- 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: |