diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-08-17 04:00:34 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-08-17 04:00:34 +0000 |
commit | ceaea7ce2c5da8e293dfa5ead86544323825455b (patch) | |
tree | 0c742d31751bec94858df8f542a1b02fae21df4e /rdiff-backup/rdiff_backup/backup.py | |
parent | e69185efef350d0ba83d0e100007730d29ea0df8 (diff) | |
download | rdiff-backup-ceaea7ce2c5da8e293dfa5ead86544323825455b.tar.gz |
Fix for error reported by Davy Durham (but need additional fix so
can restore backups made by previous versions)
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@616 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/backup.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/backup.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rdiff-backup/rdiff_backup/backup.py b/rdiff-backup/rdiff_backup/backup.py index b3e9ef5..3ee760e 100644 --- a/rdiff-backup/rdiff_backup/backup.py +++ b/rdiff-backup/rdiff_backup/backup.py @@ -365,10 +365,11 @@ class CacheCollatedPostProcess: if source_rorp: self.statfileobj.add_source_file(source_rorp) if dest_rorp: self.statfileobj.add_dest_file(dest_rorp) if success == 0: metadata_rorp = dest_rorp - elif success == 1 or success == 2: + elif success == 1: metadata_rorp = source_rorp + else: metadata_rorp = None # in case deleted because of ListError + if success == 1 or success == 2: self.statfileobj.add_changed(source_rorp, dest_rorp) - metadata_rorp = source_rorp - else: metadata_rorp = None + if metadata_rorp and metadata_rorp.lstat(): metadata.MetadataFile.write_object(metadata_rorp) if Globals.eas_active and not metadata_rorp.get_ea().empty(): |