From 308bf34152eb2b85d57e92409af60c2d59b8d0f5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 26 Feb 2007 03:38:32 +0000 Subject: [PATCH] For bug #167668, prune empty ${FILESDIR}s by adding --prune-empty-dirs to PORTAGE_RSYNC_OPTS. Thanks to Ulrich Mueller for the suggestion. (trunk r6069:6070) svn path=/main/branches/2.1.2/; revision=6071 --- bin/emerge | 3 ++- cnf/make.globals | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/emerge b/bin/emerge index b9a3fa6bf..9ae4beb78 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3738,7 +3738,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: 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" -- 2.26.2