summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-26 03:38:32 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-26 03:38:32 +0000
commit308bf34152eb2b85d57e92409af60c2d59b8d0f5 (patch)
tree03bf32bb0baab42b0f3fafbad3b6bb78028a0c82 /bin
parent2cdf3c31df50e97c9b871b2518438557c908990b (diff)
downloadportage-308bf34152eb2b85d57e92409af60c2d59b8d0f5.tar.gz
portage-308bf34152eb2b85d57e92409af60c2d59b8d0f5.tar.bz2
portage-308bf34152eb2b85d57e92409af60c2d59b8d0f5.zip
For bug #167668, prune empty ${FILESDIR}s by adding --prune-empty-dirs to PORTAGE_RSYNC_OPTS. Thanks to Ulrich Mueller <ulm@kph.uni-mainz.de> for the suggestion. (trunk r6069:6070)
svn path=/main/branches/2.1.2/; revision=6071
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge3
1 files changed, 2 insertions, 1 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: