[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup/rdiff_backup Main.py [r1-0]
From: |
Ben Escoto |
Subject: |
[Rdiff-backup-commits] rdiff-backup/rdiff_backup Main.py [r1-0] |
Date: |
Fri, 30 Dec 2005 07:45:32 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Branch: r1-0
Changes by: Ben Escoto <address@hidden> 05/12/30 07:45:32
Modified files:
rdiff_backup : Main.py
Log message:
Allow --forced restore over non-directory
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.4&tr2=1.89.2.5&r1=text&r2=text
Patches:
Index: rdiff-backup/rdiff_backup/Main.py
diff -u rdiff-backup/rdiff_backup/Main.py:1.89.2.4
rdiff-backup/rdiff_backup/Main.py:1.89.2.5
--- rdiff-backup/rdiff_backup/Main.py:1.89.2.4 Sun Dec 25 07:22:20 2005
+++ rdiff-backup/rdiff_backup/Main.py Fri Dec 30 07:45:31 2005
@@ -595,13 +595,14 @@
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"""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Rdiff-backup-commits] rdiff-backup/rdiff_backup Main.py [r1-0],
Ben Escoto <=