summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-01-29 22:45:31 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-01-29 22:45:31 +0000
commita1dda4aaa9e006d3b97f26d6fc59efc621d900f2 (patch)
treebef9cbe894b4c950aca80fb39ef600d545d4338d
parent75ac01632e687ed298452925db7d10a82cc10355 (diff)
downloadrdiff-backup-a1dda4aaa9e006d3b97f26d6fc59efc621d900f2.tar.gz
Improved --check-destination-dir error message
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-0@754 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/rdiff_backup/Main.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index 24ddbfa..3db6b35 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -616,10 +616,16 @@ Try restoring from an increment file (the filenames look like
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