diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-22 23:42:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-22 23:42:12 +0000 |
| commit | f4b9d802ea149a5c121ba8d00be8b177bca7aafd (patch) | |
| tree | 1c813a3b84f086abebf29249456b63d0bea3ec76 | |
| parent | 3c10179ea76fa6157ee5b6767082c2c3c4b1becd (diff) | |
| download | portage-f4b9d802ea149a5c121ba8d00be8b177bca7aafd.tar.gz portage-f4b9d802ea149a5c121ba8d00be8b177bca7aafd.tar.bz2 portage-f4b9d802ea149a5c121ba8d00be8b177bca7aafd.zip | |
For bug #167668, use an rsync "hide" filter rule to exclude **/files/digest-* and delete them on the receiver.
svn path=/main/trunk/; revision=6047
| -rw-r--r-- | cnf/make.globals | 2 | ||||
| -rw-r--r-- | pym/emerge/__init__.py | 1 |
2 files changed, 2 insertions, 1 deletions
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" diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index c0072d2f8..61bd4836b 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -3798,6 +3798,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: |