summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/backup.py
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-11-24 03:00:18 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-11-24 03:00:18 +0000
commit75a31e34270bfbf735d31fea152675160493b900 (patch)
tree8dc07625d9f9fd17ef0720ffb388543955cc1ead /rdiff-backup/rdiff_backup/backup.py
parent81083cb48d648e0fd96ce3d39df64c71ec15f17b (diff)
downloadrdiff-backup-75a31e34270bfbf735d31fea152675160493b900.tar.gz
"Directory not empty" fix
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@688 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/backup.py')
-rw-r--r--rdiff-backup/rdiff_backup/backup.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/rdiff-backup/rdiff_backup/backup.py b/rdiff-backup/rdiff_backup/backup.py
index 31d450d..3041bd9 100644
--- a/rdiff-backup/rdiff_backup/backup.py
+++ b/rdiff-backup/rdiff_backup/backup.py
@@ -109,12 +109,12 @@ class SourceStruct:
diff_rorp = src_rp.getRORPath()
if dest_sig.isflaglinked():
diff_rorp.flaglinked(dest_sig.get_link_flag())
- elif dest_sig.isreg() and src_rp.isreg():
- attach_diff(diff_rorp, src_rp, dest_sig)
elif src_rp.isreg():
- attach_snapshot(diff_rorp, src_rp)
+ if dest_sig.isreg(): attach_diff(diff_rorp, src_rp, dest_sig)
+ else: attach_snapshot(diff_rorp, src_rp)
+ else:
dest_sig.close_if_necessary()
- else: diff_rorp.set_attached_filetype('snapshot')
+ diff_rorp.set_attached_filetype('snapshot')
yield diff_rorp
static.MakeClass(SourceStruct)