From 9613406fbab1949f66fe7858590cab990c7b4b25 Mon Sep 17 00:00:00 2001 From: bescoto Date: Tue, 11 Feb 2003 07:37:12 +0000 Subject: First pass at integrating regress code At this point most of the tests work, but there are still problems with the finaltest error tests on /proc, and with some selection options. The regress code is totally unchecked, and regresstest.py is unwritten. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@277 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/rdiff_backup/backup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rdiff-backup/rdiff_backup/backup.py') diff --git a/rdiff-backup/rdiff_backup/backup.py b/rdiff-backup/rdiff_backup/backup.py index f776988..a4b9bff 100644 --- a/rdiff-backup/rdiff_backup/backup.py +++ b/rdiff-backup/rdiff_backup/backup.py @@ -213,7 +213,7 @@ class PatchITRB(rorpiter.ITRBranch): rp = self.get_rp_from_root(index) tf = TempFile.new(rp) self.patch_to_temp(rp, diff_rorp, tf) - tf.rename(rp) + rpath.rename(tf, rp) def patch_to_temp(self, basis_rp, diff_rorp, new): """Patch basis_rp, writing output in new, which doesn't exist yet""" @@ -260,7 +260,7 @@ class PatchITRB(rorpiter.ITRBranch): else: assert self.dir_replacement self.base_rp.rmdir() - self.dir_replacement.rename(self.base_rp) + rpath.rename(self.dir_replacement, self.base_rp) class IncrementITRB(PatchITRB): @@ -286,7 +286,7 @@ class IncrementITRB(PatchITRB): tf = TempFile.new(rp) self.patch_to_temp(rp, diff_rorp, tf) increment.Increment(tf, rp, self.get_incrp(index)) - tf.rename(rp) + rpath.rename(tf, rp) def start_process(self, index, diff_rorp): """Start processing directory""" -- cgit v1.2.1