diff options
| -rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/Time.py | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/eas_acls.py | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index d791471..3a99e4c 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,9 @@ New in v1.1.8 (????/??/??) -------------------------- +Allow for preservation of FinderInfo for folders and fix typo +in Time.py. (Patch from Andrew Ferguson.) + Test for symlink permissions support to avoid unncessary syscalls on platforms that don't support them. (Patch from Andrew Ferguson.) diff --git a/rdiff-backup/rdiff_backup/Time.py b/rdiff-backup/rdiff_backup/Time.py index 7885332..377f0b7 100644 --- a/rdiff-backup/rdiff_backup/Time.py +++ b/rdiff-backup/rdiff_backup/Time.py @@ -193,7 +193,7 @@ def time_from_session(session_num, rp = None): .get_increment_times() session_times.sort() if len(session_times) <= session_num: - return session_times[0] # Use oldest if two few backups + return session_times[0] # Use oldest if too few backups return session_times[-session_num-1] def genstrtotime(timestr, curtime = None, rp = None): diff --git a/rdiff-backup/rdiff_backup/eas_acls.py b/rdiff-backup/rdiff_backup/eas_acls.py index b392d32..37694b5 100644 --- a/rdiff-backup/rdiff_backup/eas_acls.py +++ b/rdiff-backup/rdiff_backup/eas_acls.py @@ -67,8 +67,9 @@ class ExtendedAttributes: if attr.startswith('system.'): # Do not preserve system extended attributes continue - if attr == 'com.apple.FinderInfo' or attr == 'com.apple.ResourceFork': - # FinderInfo and Resource Fork handled elsewhere + if not rp.isdir() and attr == 'com.apple.FinderInfo' or attr == 'com.apple.ResourceFork': + # FinderInfo and Resource Fork handled elsewhere, except + # for directories continue try: self.attr_dict[attr] = rp.conn.xattr.getxattr(rp.path, attr) except IOError, exc: |