From: Wayne Davison <wayned@samba.org>
Date: Fri, 3 Feb 2006 23:16:46 +0000 (+0000)
Subject: Avoid adding our own exclude of the partial-dir name if the
X-Git-Tag: v2.6.7pre1~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fc808dd9839faf283aa958d6178d1174f1ac9de;p=thirdparty%2Frsync.git

Avoid adding our own exclude of the partial-dir name if the
user's filter rules already match it.
---

diff --git a/options.c b/options.c
index 50a820b5..0f0d8f2c 100644
--- a/options.c
+++ b/options.c
@@ -1368,7 +1368,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 				clean_fname(partial_dir, 1);
 			if (!*partial_dir || strcmp(partial_dir, ".") == 0)
 				partial_dir = NULL;
-			else if (*partial_dir != '/') {
+			else if (*partial_dir != '/'
+			 && check_filter(&filter_list, partial_dir, 1) == 0) {
 				parse_rule(&filter_list, partial_dir,
 				    MATCHFLG_NO_PREFIXES|MATCHFLG_DIRECTORY, 0);
 			}