[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> 08/10/23 16:31:09

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : rpath.py 

Log message:
        Inform the user of which file has failed if an exception occurs during a
        rename operation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.314&r2=1.315
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&r1=1.131&r2=1.132

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -b -r1.314 -r1.315
--- CHANGELOG   19 Oct 2008 17:12:28 -0000      1.314
+++ CHANGELOG   23 Oct 2008 16:31:09 -0000      1.315
@@ -1,6 +1,8 @@
 New in v1.2.3 (????/??/??)
 ---------------------------
 
+Inform the user of which file has failed if an exception occurs during a
+rename operation. (Andrew Ferguson)
 
 
 New in v1.2.2 (2008/10/19)

Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- rdiff_backup/rpath.py       12 Oct 2008 02:21:30 -0000      1.131
+++ rdiff_backup/rpath.py       23 Oct 2008 16:31:09 -0000      1.132
@@ -255,7 +255,10 @@
                        try:
                            rp_source.conn.os.rename(rp_source.path, 
rp_dest.path)
                        except OSError, error:
-                               if error.errno != errno.EEXIST: raise
+                               if error.errno != errno.EEXIST:
+                                       log.Log("OSError while renaming %s to 
%s"
+                                                       % (rp_source.path, 
rp_dest.path), 1)
+                                       raise
 
                                # On Windows, files can't be renamed on top of 
an existing file
                                rp_source.conn.os.unlink(rp_dest.path)