summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/eas_acls.py
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-10-14 07:33:12 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-10-14 07:33:12 +0000
commitd8cee73f6ab56d8ec6fb2b9969cefb9d9d521bb4 (patch)
treedf6dc311a9e6d44376c32fdd8e9a35bf68d50ef5 /rdiff-backup/rdiff_backup/eas_acls.py
parent8ca3cf2a1d13e07988b6b7bc7f8c27fe6d150fb4 (diff)
downloadrdiff-backup-d8cee73f6ab56d8ec6fb2b9969cefb9d9d521bb4.tar.gz
Final changes for 0.13.3
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@474 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/eas_acls.py')
-rw-r--r--rdiff-backup/rdiff_backup/eas_acls.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/rdiff-backup/rdiff_backup/eas_acls.py b/rdiff-backup/rdiff_backup/eas_acls.py
index e8258ad..4cf14cc 100644
--- a/rdiff-backup/rdiff_backup/eas_acls.py
+++ b/rdiff-backup/rdiff_backup/eas_acls.py
@@ -170,10 +170,10 @@ class ExtendedAttributesFile(metadata.FlatFile):
yield rorp
ea_iter = cls.get_objects_at_time(rbdir, time, restrict_index)
- if ea_iter: return helper(rorp_iter, ea_iter)
- else:
- log.Log("Warning: Extended attributes file not found",2)
- return rorp_iter
+ if not ea_iter:
+ log.Log("Warning: Extended attributes file not found", 2)
+ ea_iter = iter([])
+ return helper(rorp_iter, ea_iter)
static.MakeClass(ExtendedAttributesFile)
@@ -501,10 +501,10 @@ class AccessControlListFile(metadata.FlatFile):
yield rorp
acl_iter = cls.get_objects_at_time(rbdir, time, restrict_index)
- if acl_iter: return helper(rorp_iter, acl_iter)
- else:
+ if not acl_iter:
log.Log("Warning: Access Control List file not found", 2)
- return rorp_iter
+ acl_iter = iter([])
+ return helper(rorp_iter, acl_iter)
static.MakeClass(AccessControlListFile)