summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-12-20 14:27:12 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-12-20 14:27:12 +0000
commite601a12bfe58ac74f2e510f063e7ee93f5e9359e (patch)
tree2d989435a25cfdefe4adaf328a6e3d86944052bd
parent431a0be45fd38e8c0ddec09d54c56fcf8aa00c19 (diff)
downloadrdiff-backup-e601a12bfe58ac74f2e510f063e7ee93f5e9359e.tar.gz
More error message improvements
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@976 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/rdiff_backup/Main.py2
-rw-r--r--rdiff-backup/rdiff_backup/backup.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index c9118bf..e6adec1 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -444,7 +444,7 @@ option.""" % rpout.path)
if not Globals.rbdir.lstat():
try:
Globals.rbdir.mkdir()
- except IOError, exc:
+ except (OSError, IOError), exc:
Log.FatalError(
"""Could not create rdiff-backup directory
diff --git a/rdiff-backup/rdiff_backup/backup.py b/rdiff-backup/rdiff_backup/backup.py
index 2f5c9e4..6284a6b 100644
--- a/rdiff-backup/rdiff_backup/backup.py
+++ b/rdiff-backup/rdiff_backup/backup.py
@@ -707,7 +707,9 @@ class IncrementITRB(PatchITRB):
self.base_rp, inc_prefix = longname.get_mirror_inc_rps(
self.CCPP.get_rorps(index), self.basis_root_rp, self.inc_root_rp)
self.base_rp.setdata()
- assert diff_rorp.isdir() or self.base_rp.isdir()
+ assert diff_rorp.isdir() or self.base_rp.isdir(), \
+ ("Either %s or %s must be a directory" % (repr(diff_rorp.path),
+ repr(self.base_rp.path)))
if diff_rorp.isdir():
inc = increment.Increment(diff_rorp, self.base_rp, inc_prefix)
if inc and inc.isreg():