summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rdiff-backup/CHANGELOG2
-rw-r--r--rdiff-backup/rdiff_backup/rpath.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 0554e38..2a8231f 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -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)
diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py
index a75cc0e..e5e19fa 100644
--- a/rdiff-backup/rdiff_backup/rpath.py
+++ b/rdiff-backup/rdiff_backup/rpath.py
@@ -255,7 +255,10 @@ def rename(rp_source, rp_dest):
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)