diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-01 02:55:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-01 02:55:55 +0000 |
| commit | 428d46be750420fd00af619155b4de3ea722c8b6 (patch) | |
| tree | b0270ebb736147c1c236e1e46319e570eedce56c | |
| parent | 958054298dae8958a66d7fc68b6b5ffcff15ca22 (diff) | |
| download | portage-428d46be750420fd00af619155b4de3ea722c8b6.tar.gz portage-428d46be750420fd00af619155b4de3ea722c8b6.tar.bz2 portage-428d46be750420fd00af619155b4de3ea722c8b6.zip | |
Remove the manifest1 digest filter from PORTAGE_RSYNC_OPTS since it's
no longer needed. (trunk r9260)
svn path=/main/branches/2.1.2/; revision=9261
| -rwxr-xr-x | bin/emerge | 1 | ||||
| -rw-r--r-- | cnf/make.globals | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 0058805c7..818a37030 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4894,7 +4894,6 @@ 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 0395c2ae2..8fd5fc0b6 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 --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 --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" # Minimal CONFIG_PROTECT CONFIG_PROTECT="/etc" |