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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/12/18 21:49:02

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Main.py 

Log message:
        Print a more helpful error message if we cannot write to the backup
        destination.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.328&r2=1.329
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.121&r2=1.122

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -b -r1.328 -r1.329
--- CHANGELOG   18 Dec 2008 03:46:51 -0000      1.328
+++ CHANGELOG   18 Dec 2008 21:49:01 -0000      1.329
@@ -1,6 +1,9 @@
 New in v1.2.3 (????/??/??)
 ---------------------------
 
+Print a more helpful error message if we cannot write to the backup
+destination. (Andrew Ferguson)
+
 Add ETIMEDOUT to the list of recoverable errors; when irrecoverable, a
 ConnectionError is raised. Closes Ubuntu bug #304659. (Andrew Ferguson)
 

Index: rdiff_backup/Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- rdiff_backup/Main.py        12 Oct 2008 02:21:29 -0000      1.121
+++ rdiff_backup/Main.py        18 Dec 2008 21:49:02 -0000      1.122
@@ -441,7 +441,21 @@
        elif check_failed_initial_backup():
                fix_failed_initial_backup()
 
-       if not Globals.rbdir.lstat(): Globals.rbdir.mkdir()
+       if not Globals.rbdir.lstat():
+               try:
+                       Globals.rbdir.mkdir()
+               except IOError, exc:
+                       Log.FatalError(
+"""Could not create rdiff-backup directory
+
+%s
+
+due to
+
+%s
+
+Please check that the rdiff-backup user can create files and directories in the
+destination directory: %s""" % (Globals.rbdir.path, exc, rpout.path))
        SetConnections.UpdateGlobal('rbdir', Globals.rbdir)
 
 def backup_warn_if_infinite_regress(rpin, rpout):