diff options
author | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-05-20 18:09:10 +0000 |
---|---|---|
committer | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-05-20 18:09:10 +0000 |
commit | e90980098d2ae3458a56b19d12805f62def8f8d6 (patch) | |
tree | 03105e5110343441fa7dd6954cafd3652e88afd8 /rdiff-backup/rdiff_backup/selection.py | |
parent | 9091865590125881b709626fc372239654714ba8 (diff) | |
download | rdiff-backup-e90980098d2ae3458a56b19d12805f62def8f8d6.tar.gz |
Fixed --include reporting bug, and added error checking to directory
listings so that "door" files would be skipped
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@91 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/selection.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/selection.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rdiff-backup/rdiff_backup/selection.py b/rdiff-backup/rdiff_backup/selection.py index aa98a49..0bb46e2 100644 --- a/rdiff-backup/rdiff_backup/selection.py +++ b/rdiff-backup/rdiff_backup/selection.py @@ -129,7 +129,8 @@ class Select: new_dsrp = Robust.check_common_error( lambda: dsrpath.append(filename)) if not new_dsrp: - Log("Error initializing file %s" % dsrpath.path, 2) + Log("Error initializing file %s/%s" % + (dsrpath.path, filename), 2) else: for dsrp in rec_func(new_dsrp, rec_func, sel_func): yield dsrp @@ -237,7 +238,7 @@ pattern (such as '**') which matches the base directory.""" % only specifies that files be included. Because the default is to include all files, the expression is redundant. Exiting because this probably isn't what you meant.""" % - (self.selection_functions[-1].name, self.prefix)) + (self.selection_functions[-1].name,)) def add_selection_func(self, sel_func, add_to_start = None): """Add another selection function at the end or beginning""" @@ -380,7 +381,8 @@ probably isn't what you meant.""" % else: sel_func = self.glob_get_normal_sf(glob_str, include) sel_func.exclude = not include - sel_func.name = "Command-line glob: %s" % glob_str + sel_func.name = "Command-line %s glob: %s" % \ + (include and "include" or "exclude", glob_str) return sel_func def glob_get_filename_sf(self, filename, include): |