diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-06-26 07:23:04 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-06-26 07:23:04 +0000 |
commit | 460ce08ff4d9cb7bd94fd5b1f1f8c015b18880c7 (patch) | |
tree | ce437fabd109c169b368971e03e39508c1209cd9 /rdiff-backup/rdiff_backup/backup.py | |
parent | 2a9c3ebc83931e352c7b05fdd5f53f6eafe3e223 (diff) | |
download | rdiff-backup-460ce08ff4d9cb7bd94fd5b1f1f8c015b18880c7.tar.gz |
Various changes for 0.12.0
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@332 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/backup.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/backup.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/rdiff-backup/rdiff_backup/backup.py b/rdiff-backup/rdiff_backup/backup.py index 59663c6..89d7bea 100644 --- a/rdiff-backup/rdiff_backup/backup.py +++ b/rdiff-backup/rdiff_backup/backup.py @@ -166,9 +166,11 @@ class DestinationStruct: yield iterfile.RORPIterFlushRepeat else: index = src_rorp and src_rorp.index or dest_rorp.index - cls.CCPP.flag_changed(index) - yield cls.get_one_sig(dest_base_rpath, index, + sig = cls.get_one_sig(dest_base_rpath, index, src_rorp, dest_rorp) + if sig: + cls.CCPP.flag_changed(index) + yield sig def get_one_sig(cls, dest_base_rpath, index, src_rorp, dest_rorp): """Return a signature given source and destination rorps""" @@ -180,9 +182,11 @@ class DestinationStruct: dest_sig = dest_rorp.getRORPath() if dest_rorp.isreg(): dest_rp = dest_base_rpath.new_index(index) - if dest_rp.isreg(): # otherwise file has changed type from reg - dest_sig.setfile(Rdiff.get_signature(dest_rp)) - else: dest_sig = dest_rp.getRORPath() + if not dest_rp.isreg(): + log.ErrorLog.write_if_open("UpdateError", dest_rp, + "File changed from regular file before signature") + return None + dest_sig.setfile(Rdiff.get_signature(dest_rp)) else: dest_sig = rpath.RORPath(index) return dest_sig |