From 727ed4ecc5a9ebc4db1c3e550f9a989d29637fb3 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 20 Sep 2002 00:51:00 +0000 Subject: Changed resume code - unpickling may cause variety of errors git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@209 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/rdiff_backup/robust.py | 5 +++-- rdiff-backup/src/robust.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index 5726914..cecd33c 100644 --- a/rdiff-backup/rdiff_backup/robust.py +++ b/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): diff --git a/rdiff-backup/src/robust.py b/rdiff-backup/src/robust.py index 5726914..cecd33c 100644 --- a/rdiff-backup/src/robust.py +++ b/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): -- cgit v1.2.1