diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-12-30 07:45:31 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-12-30 07:45:31 +0000 |
commit | be04183e6012d842448a7363f1202f5a1e093d6c (patch) | |
tree | cd51c4b70777de76c8898875ebcf85551e9edf1d /rdiff-backup/rdiff_backup/Main.py | |
parent | 33890ccb5a5719cd7fea063111af633f5f44f464 (diff) | |
download | rdiff-backup-be04183e6012d842448a7363f1202f5a1e093d6c.tar.gz |
Allow --forced restore over non-directory
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-0@731 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/Main.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py index c849e81..24ddbfa 100644 --- a/rdiff-backup/rdiff_backup/Main.py +++ b/rdiff-backup/rdiff_backup/Main.py @@ -595,13 +595,14 @@ def restore_start_log(rpin, target, time): if Log.verbosity >= 3: Log.log_to_file(log_message) def restore_check_paths(rpin, rpout, restoreasof = None): - """Check paths and return pair of corresponding rps""" + """Make sure source and destination exist, and have appropriate type""" if not restoreasof: if not rpin.lstat(): Log.FatalError("Source file %s does not exist" % rpin.path) if not force and rpout.lstat() and (not rpout.isdir() or rpout.listdir()): Log.FatalError("Restore target %s already exists, " "specify --force to overwrite." % rpout.path) + if force and rpout.lstat() and not rpout.isdir(): rpout.delete() def restore_check_backup_dir(mirror_root, src_rp = None, restore_as_of = 1): """Make sure backup dir root rpin is in consistent state""" |