[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> 09/01/31 18:11:18

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Main.py 

Log message:
        Improve error message if regress operation fails due to Security 
Violation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.351&r2=1.352
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.133&r2=1.134

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -b -r1.351 -r1.352
--- CHANGELOG   27 Jan 2009 18:42:51 -0000      1.351
+++ CHANGELOG   31 Jan 2009 18:11:18 -0000      1.352
@@ -1,7 +1,8 @@
 New in v1.3.2 (????/??/??)
 ---------------------------
 
-
+Improve error message if regress operation fails due to Security Violation.
+Thanks to Grzegorz Marszalek for the bug report. (Andrew Ferguson)
 
 
 New in v1.3.1 (2009/01/27)

Index: rdiff_backup/Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- rdiff_backup/Main.py        7 Jan 2009 14:20:34 -0000       1.133
+++ rdiff_backup/Main.py        31 Jan 2009 18:11:18 -0000      1.134
@@ -919,4 +919,9 @@
        if need_check == 1:
                Log("Previous backup seems to have failed, regressing "
                        "destination now.", 2)
+               try:
                dest_rp.conn.regress.Regress(dest_rp)
+               except Security.Violation:
+                       Log.FatalError("Security violation while attempting to 
regress "
+                                                  "destination, perhaps due to 
--restrict-read-only "
+                                                  "or --restrict-update-only.")