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@616 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

trunk/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():