summaryrefslogtreecommitdiff
path: root/exclude.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-12-28 06:27:22 +0000
committerWayne Davison <wayned@samba.org>2006-12-28 06:27:22 +0000
commitc2f0e4d965849a8860c5bb8f59ba548fc28805ec (patch)
treeb4b9d294c00f9efc6b0d35f9e120db80a0ffd3c0 /exclude.c
parent8576397c3e51319260bd0ec8cc7f8663d90afb2c (diff)
downloadrsync-c2f0e4d965849a8860c5bb8f59ba548fc28805ec.tar.gz
rsync-c2f0e4d965849a8860c5bb8f59ba548fc28805ec.tar.bz2
rsync-c2f0e4d965849a8860c5bb8f59ba548fc28805ec.zip
Don't include MATCHFLG_PERISHABLE in CVS-exclude handling unless
we're talking protocol 30 or above.
Diffstat (limited to 'exclude.c')
-rw-r--r--exclude.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/exclude.c b/exclude.c
index 11b187c6..cfaed26f 100644
--- a/exclude.c
+++ b/exclude.c
@@ -879,14 +879,16 @@ static char default_cvsignore[] =
static void get_cvs_excludes(uint32 mflags)
{
- char *p, fname[MAXPATHLEN];
static int initialized = 0;
+ char *p, fname[MAXPATHLEN];
if (initialized)
return;
initialized = 1;
- parse_rule(&cvs_filter_list, default_cvsignore, mflags | MATCHFLG_PERISHABLE, 0);
+ parse_rule(&cvs_filter_list, default_cvsignore,
+ mflags | (protocol_version >= 30 ? MATCHFLG_PERISHABLE : 0),
+ 0);
p = module_id >= 0 && lp_use_chroot(module_id) ? "/" : getenv("HOME");
if (p && pathjoin(fname, MAXPATHLEN, p, ".cvsignore") < MAXPATHLEN)