[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/backup.py

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 09/01/06 21:33:22

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : backup.py 

Log message:
        Ignore Windows errors caused by too long filenames

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.346&r2=1.347
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/backup.py?cvsroot=rdiff-backup&r1=1.48&r2=1.49

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -b -r1.346 -r1.347
--- CHANGELOG   3 Jan 2009 23:54:11 -0000       1.346
+++ CHANGELOG   6 Jan 2009 21:33:22 -0000       1.347
@@ -1,6 +1,10 @@
 New in v1.3.1 (????/??/??)
 ---------------------------
 
+Fix typo in robust.py which broke error reporting. Closes Savannah bug #25255.
+
+Ignore Windows errors caused by too long filenames; the files are not yet
+backed-up, but the backup process is no longer halted. (Andrew Ferguson)
 
 
 New in v1.3.0 (2009/01/03)

Index: rdiff_backup/backup.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/backup.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- rdiff_backup/backup.py      3 Jan 2009 21:41:53 -0000       1.48
+++ rdiff_backup/backup.py      6 Jan 2009 21:33:22 -0000       1.49
@@ -532,8 +532,11 @@
                tf = TempFile.new(mirror_rp)
                if self.patch_to_temp(mirror_rp, diff_rorp, tf):
                        if tf.lstat():
-                               rpath.rename(tf, mirror_rp)
+                               if 
robust.check_common_error(self.error_handler, rpath.rename,
+                                               (tf, mirror_rp)) is None:
                                self.CCPP.flag_success(index)
+                               else:
+                                       tf.delete()
                        elif mirror_rp and mirror_rp.lstat():
                                mirror_rp.delete()
                                self.CCPP.flag_deleted(index)
@@ -691,14 +694,18 @@
                        self.CCPP.get_rorps(index), self.basis_root_rp, 
self.inc_root_rp)
                tf = TempFile.new(mirror_rp)
                if self.patch_to_temp(mirror_rp, diff_rorp, tf):
-                       inc = increment.Increment(tf, mirror_rp, inc_prefix)
-                       if inc is not None:
+                       inc = robust.check_common_error(self.error_handler,
+                                       increment.Increment, (tf, mirror_rp, 
inc_prefix))
+                       if inc is not None and not isinstance(inc, int):
                                self.CCPP.set_inc(index, inc)
                                if inc.isreg():
                                        inc.fsync_with_dir() # Write inc before 
rp changed
                                if tf.lstat():
-                                       rpath.rename(tf, mirror_rp)
+                                       if 
robust.check_common_error(self.error_handler,
+                                                       rpath.rename, (tf, 
mirror_rp)) is None:
                                        self.CCPP.flag_success(index)
+                                       else:
+                                               tf.delete()
                                elif mirror_rp.lstat():
                                        mirror_rp.delete()
                                        self.CCPP.flag_deleted(index)