diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2006-01-10 06:15:42 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2006-01-10 06:15:42 +0000 |
| commit | c38eef4fb3ddc1e0f2808bf118a5f7dc6fa1a0a0 (patch) | |
| tree | b7cd7338a95b97e90b3859e35eb2bc7a14859bde /rdiff-backup/rdiff_backup | |
| parent | ca1b97bbb42668e10a96a57fbe7c96df934ac84f (diff) | |
| download | rdiff-backup-c38eef4fb3ddc1e0f2808bf118a5f7dc6fa1a0a0.tar.gz | |
Fix for Toni Price's empty dir --include **XXX selection bug
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-0@739 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup')
| -rw-r--r-- | rdiff-backup/rdiff_backup/selection.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/selection.py b/rdiff-backup/rdiff_backup/selection.py index 310aed3..bff1e0c 100644 --- a/rdiff-backup/rdiff_backup/selection.py +++ b/rdiff-backup/rdiff_backup/selection.py @@ -209,10 +209,12 @@ class Select: def Select(self, rp): """Run through the selection functions and return dominant val 0/1/2""" + scanned = 0 # 0, by default, or 2 if prev sel func scanned rp for sf in self.selection_functions: result = sf(rp) - if result == 1 or result == 0 or (result == 2 and rp.isdir()): - return result + if result == 1: return 1 + elif result == 0: return scanned + elif result == 2: scanned = 2 return 1 def ParseArgs(self, argtuples, filelists): |