summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-09 05:35:47 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-09 05:35:47 +0000
commitf0ec078e6acbe86342ed6066ae886ceac3c5d855 (patch)
tree0f886caa9494ac10393c7d3b0f71e330a2045337 /rdiff-backup/rdiff_backup
parent54f02ea7da4223001b22e2f0b8c9427f1cdadd1b (diff)
downloadrdiff-backup-f0ec078e6acbe86342ed6066ae886ceac3c5d855.tar.gz
Fixed selection bug reported by Daniel Richard G. and added test to
selectiontest.py to check for it. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@602 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup')
-rw-r--r--rdiff-backup/rdiff_backup/selection.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/rdiff-backup/rdiff_backup/selection.py b/rdiff-backup/rdiff_backup/selection.py
index 88f9676..310aed3 100644
--- a/rdiff-backup/rdiff_backup/selection.py
+++ b/rdiff-backup/rdiff_backup/selection.py
@@ -211,7 +211,8 @@ class Select:
"""Run through the selection functions and return dominant val 0/1/2"""
for sf in self.selection_functions:
result = sf(rp)
- if result is not None: return result
+ if result == 1 or result == 0 or (result == 2 and rp.isdir()):
+ return result
return 1
def ParseArgs(self, argtuples, filelists):