short-term (?) kludge so missing carbonfile data doesn't cause crash

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@634 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

trunk/rdiff-backup/CHANGELOG

@@ -4,6 +4,9 @@ New in v1.0.2 (????/??/??)
 Fix for bug 14545 which was introduced in version 1.0.1:  Quoting
 caused a spurious security violation.  (Important for Mac OS X)
 
+An error reading carbonfile data on Mac OS X should no longer cause a
+crash.  (Thanks to Kevin Horton for testing.)
+
 
 New in v1.0.1 (2005/09/10)
 --------------------------

trunk/rdiff-backup/rdiff_backup/rpath.py

@@ -1145,11 +1145,18 @@ class RPath(RORPath):
 			self.data['carbonfile'] = cfile
 			return cfile
 		except MacOS.Error:
+			log.Log("Cannot read carbonfile information from %s" %
+					(self.path,), 2)
 			self.data['carbonfile'] = None 
 			return self.data['carbonfile']
 
 	def write_carbonfile(self, cfile):
 		"""Write new carbon data to self."""
+		if not cfile:
+			# This should be made cleaner---if you know Mac OS X tell
+			# me what could cause an error in get_carbonfile above
+			return
+			
 		log.Log("Writing carbon data to %s" % (self.index,), 7)
 		from Carbon.File import FSSpec
 		import MacOS