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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/12/20 14:27:12

Modified files:
        rdiff_backup   : Main.py backup.py 

Log message:
        More error message improvements

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/backup.py?cvsroot=rdiff-backup&r1=1.45&r2=1.46

Patches:
Index: Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- Main.py     19 Dec 2008 14:55:38 -0000      1.123
+++ Main.py     20 Dec 2008 14:27:12 -0000      1.124
@@ -444,7 +444,7 @@
        if not Globals.rbdir.lstat():
                try:
                        Globals.rbdir.mkdir()
-               except IOError, exc:
+               except (OSError, IOError), exc:
                        Log.FatalError(
 """Could not create rdiff-backup directory
 

Index: backup.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/backup.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- backup.py   28 Jan 2008 04:33:55 -0000      1.45
+++ backup.py   20 Dec 2008 14:27:12 -0000      1.46
@@ -707,7 +707,9 @@
                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():