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

[Ben Escoto]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         r1-0
Changes by:     Ben Escoto <address@hidden>     06/01/29 22:45:31

Modified files:
        rdiff_backup   : Main.py 

Log message:
        Improved --check-destination-dir error message

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup/rdiff_backup/Main.py.diff?only_with_tag=r1-0&tr1=1.89.2.5&tr2=1.89.2.6&r1=text&r2=text

Patches:
Index: rdiff-backup/rdiff_backup/Main.py
diff -u rdiff-backup/rdiff_backup/Main.py:1.89.2.5 
rdiff-backup/rdiff_backup/Main.py:1.89.2.6
--- rdiff-backup/rdiff_backup/Main.py:1.89.2.5  Fri Dec 30 07:45:31 2005
+++ rdiff-backup/rdiff_backup/Main.py   Sun Jan 29 22:45:31 2006
@@ -616,10 +616,16 @@
        if result is None:
                Log.FatalError("%s does not appear to be an rdiff-backup 
directory."
                                           % (Globals.rbdir.path,))
-       elif result == 1: Log.FatalError(
-               "Previous backup to %s seems to have failed.\nRerun 
rdiff-backup "
-               "with --check-destination-dir option to revert directory "
-               "to state before unsuccessful session." % (mirror_root.path,))
+       elif result == 1: Log.FatalError("""
+The previous backup to %s is still in progress or has failed.
+You can rerun rdiff-backup with --check-destination-dir option to revert
+the directory to the state it was in before an unsuccessful session.
+However,
+*** -------------------------------------------------------------------- ***
+*** If an rdiff-backup process is currently running,                     ***
+*** DO NOT RUN --check-destination-dir OR OTHERWISE MODIFY THE DIRECTORY ***
+*** -------------------------------------------------------------------- ***
+""" % (mirror_root.path,))
 
 def restore_set_root(rpin):
        """Set data dir, restore_root and index, or return None if fail