summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2004-05-16 20:58:56 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2004-05-16 20:58:56 +0000
commit4b1f7f9c4bf42d5e018ce2d5e835d807fce57483 (patch)
tree3c983a8294f410d5a661fecb0bde4aaf384fe27f
parent8c581e76fb2837f899a35d318c669c01dd13fe86 (diff)
downloadrdiff-backup-4b1f7f9c4bf42d5e018ce2d5e835d807fce57483.tar.gz
NFS friendly fix by Perdaens
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-12@528 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG8
-rw-r--r--rdiff-backup/rdiff_backup/rpath.py4
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()