diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-22 23:45:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-22 23:45:18 +0000 |
| commit | b22e9b48406903ab2ae96198e97935d16580e97f (patch) | |
| tree | eb2351c9737480984859b5f13661571bf85a63ba | |
| parent | 74d8f1edbb5f2d31384c72e0b2449be49ed79905 (diff) | |
| download | portage-b22e9b48406903ab2ae96198e97935d16580e97f.tar.gz portage-b22e9b48406903ab2ae96198e97935d16580e97f.tar.bz2 portage-b22e9b48406903ab2ae96198e97935d16580e97f.zip | |
For bug #167668, use an rsync "hide" filter rule to exclude **/files/digest-* and delete them on the receiver. (trunk r6046:6047)
svn path=/main/branches/2.1.2/; revision=6049
| -rwxr-xr-x | bin/emerge | 1 | ||||
| -rw-r--r-- | cnf/make.globals | 2 |
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" |