diff options
| -rw-r--r-- | rdiff-backup/CHANGELOG | 8 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index df83047..8069a54 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -9,7 +9,13 @@ Kaltenecker for bug report. Fixed error when --restrict path given with trailing backslash. Bug report by Åke Brännström. -Backported regress fix from 0.13.x. But noticed by Alan Horn. +Backported regress fix from 0.13.x. Bug noticed by Alan Horn. + +Added error-correcting fsync suggestion by Antoine Perdaens. +rdiff-backup may work better with NFS now. + +Fix for regress warning code: rdiff-backup should warn you if you are +trying to back up a directory into itself. New in v0.12.6 (2003/11/02) diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index 6f40edd..15aacc0 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -724,7 +724,9 @@ class RPath(RORPath): log.Log("Deleting %s" % self.path, 7) if self.isdir(): try: self.rmdir() - except os.error: shutil.rmtree(self.path) + except os.error: + if Globals.fsync_directories: self.fsync() + self.conn.shutil.rmtree(self.path) else: self.conn.os.unlink(self.path) self.setdata() |