Changed resume code - unpickling may cause variety of errors

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

trunk/rdiff-backup/rdiff_backup/robust.py

@@ -607,8 +607,9 @@ class Resume:
 		data = fp.read()
 		fp.close()
 		try: result = cPickle.loads(data)
-		except cPickle.UnpicklingError:
-			raise ResumeException("Bad pickle at %s" % (checkpoint_rp.path,))
+		except Exception, exc:
+			raise ResumeException("Bad pickle at %s: %s" %
+								  (checkpoint_rp.path, exc))
 		return result
 
 	def ResumeCheck(cls):

trunk/rdiff-backup/src/robust.py

@@ -607,8 +607,9 @@ class Resume:
 		data = fp.read()
 		fp.close()
 		try: result = cPickle.loads(data)
-		except cPickle.UnpicklingError:
-			raise ResumeException("Bad pickle at %s" % (checkpoint_rp.path,))
+		except Exception, exc:
+			raise ResumeException("Bad pickle at %s: %s" %
+								  (checkpoint_rp.path, exc))
 		return result
 
 	def ResumeCheck(cls):