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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/12/25 03:45:13

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : rpath.py 

Log message:
        Print a more helpful error message when we get a "Result too large" 
error

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.250&r2=1.251
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&r1=1.116&r2=1.117

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -b -r1.250 -r1.251
--- CHANGELOG   25 Dec 2007 02:12:30 -0000      1.250
+++ CHANGELOG   25 Dec 2007 03:45:13 -0000      1.251
@@ -1,6 +1,9 @@
 New in v1.1.15 (????/??/??)
 ---------------------------
 
+Print a more helpful error message when we get a "Result too large"
+error when trying to copy a file. (Andrew Ferguson)
+
 Fix bug where rdiff-backup fails after all increments are removed. Closes
 Savannah bug #20291. (Andrew Ferguson)
 

Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- rdiff_backup/rpath.py       25 Dec 2007 00:28:04 -0000      1.116
+++ rdiff_backup/rpath.py       25 Dec 2007 03:45:13 -0000      1.117
@@ -125,7 +125,17 @@
                        rpout.setdata()
                        return v
        except AttributeError: pass
+       try:
        return rpout.write_from_fileobj(rpin.open("rb"), compress = compress)
+       except IOError, e:
+               if (e.errno == errno.ERANGE):
+                       log.Log.FatalError("'IOError - Result too large' while 
reading %s. "
+                                                          "If you are using a 
Mac, this is probably "
+                                                          "the result of HFS+ 
filesystem corruption. "
+                                                          "Please exclude this 
file from your backup "
+                                                          "before proceeding." 
% rpin.path)
+               else:
+                       raise
 
 def cmp(rpin, rpout):
        """True if rpin has the same data as rpout