From 807241bc4f322edc6f95782291900362484263df Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 10 May 2002 23:14:35 +0000 Subject: Lots of changes, see changelog for 0.7.4. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@72 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/rdiff_backup/robust.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rdiff-backup/rdiff_backup/robust.py') diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index 22f35b9..a71eabc 100644 --- a/rdiff-backup/rdiff_backup/robust.py +++ b/rdiff-backup/rdiff_backup/robust.py @@ -252,7 +252,7 @@ class TempFile(RPath): if self.isdir() and not rp_dest.isdir(): # Cannot move a directory directly over another file rp_dest.delete() - if (isinstance(rp_dest, DSRPath) and rp_dest.perms_delayed + if (isinstance(rp_dest, DSRPath) and rp_dest.delay_perms and not self.hasfullperms()): # If we are moving to a delayed perm directory, delay # permission change on destination. @@ -531,7 +531,7 @@ class Resume: Log("Last backup dated %s was aborted, but we aren't " "resuming it." % Time.timetopretty(si.time), 2) return None - assert 0 + assert None MakeClass(Resume) -- cgit v1.2.1