diff options
| -rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/regress.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 049cb02..8d2a808 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,9 @@ New in v1.1.15 (????/??/??) --------------------------- +Regress.restore_orig_regfile should check if directories can be fsync'd +before doing so. Fixes Savannah bug #21546. (Patch from Marc Horowitz) + Rewrite quoting logic to independently check for escaping Windows special characters, non-ASCII chars, and uppercase chars. (Andrew Ferguson) diff --git a/rdiff-backup/rdiff_backup/regress.py b/rdiff-backup/rdiff_backup/regress.py index 2adc333..883905c 100644 --- a/rdiff-backup/rdiff_backup/regress.py +++ b/rdiff-backup/rdiff_backup/regress.py @@ -294,7 +294,8 @@ class RegressITRB(rorpiter.ITRBranch): if rf.mirror_rp.lstat(): rf.mirror_rp.delete() rf.mirror_rp.write_from_fileobj(rf.get_restore_fp()) rpath.copy_attribs(rf.metadata_rorp, rf.mirror_rp) - rf.mirror_rp.get_parent_rp().fsync() # require move before inc delete + if Globals.fsync_directories: + rf.mirror_rp.get_parent_rp().fsync() # force move before inc delete def start_process(self, index, rf): """Start processing directory""" |