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

[Ben Escoto]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         
Changes by:     Ben Escoto <address@hidden>     05/12/30 07:00: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?tr1=1.103&tr2=1.104&r1=text&r2=text

Patches:
Index: rdiff-backup/rdiff_backup/Main.py
diff -u rdiff-backup/rdiff_backup/Main.py:1.103 
rdiff-backup/rdiff_backup/Main.py:1.104
--- rdiff-backup/rdiff_backup/Main.py:1.103     Thu Dec 22 21:11:02 2005
+++ rdiff-backup/rdiff_backup/Main.py   Fri Dec 30 07:00:32 2005
@@ -535,13 +535,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"""