@@ -18,7 +18,7 @@ from __future__ import division import cPickle import getopt -from sys import argv,exit +from sys import argv,exit,stderr import os import signal max_keyweight=1000 @@ -84,8 +84,9 @@ def open_dic(dic_file,error_recovery=False): path_dict=cPickle.load(aj_file) aj_file.close() return path_dict - except (IOError,EOFError): + except (IOError,EOFError,cPickle.UnpicklingError): if not error_recovery and os.path.exists(dic_file+".bak"): + print >> stderr, 'Problem with autojump database, trying to recover from backup...' import shutil shutil.copy(dic_file+".bak",dic_file) return open_dic(dic_file,True) autojump 0ec15907e3f63ef09182a8d183832bc26356270c Joel Schaerer joelthelion@laposte.net http://github.com/joelthelion/autojump/commit/2d4e3c8a6cd4d85b57e7c10ac0320e9014d0e265 2d4e3c8a6cd4d85b57e7c10ac0320e9014d0e265 2009-10-03T11:36:18-07:00 2009-10-03T11:36:18-07:00 Automatically recover from db corruption. Thanks epall!!! ef687324db67904c75ab4de538f743f04e1be719 Joel Schaerer joelthelion@laposte.net