mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
82bbac4568
@ -10,6 +10,7 @@ __docformat__ = 'restructuredtext en'
|
|||||||
|
|
||||||
import re, string, traceback
|
import re, string, traceback
|
||||||
|
|
||||||
|
from calibre import prints
|
||||||
from calibre.constants import DEBUG
|
from calibre.constants import DEBUG
|
||||||
from calibre.utils.formatter_functions import formatter_functions, compile_user_function
|
from calibre.utils.formatter_functions import formatter_functions, compile_user_function
|
||||||
from calibre.utils.config import tweaks
|
from calibre.utils.config import tweaks
|
||||||
@ -525,6 +526,8 @@ class TemplateFormatter(string.Formatter):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
if DEBUG: # and getattr(e, 'is_locking_error', False):
|
if DEBUG: # and getattr(e, 'is_locking_error', False):
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
if column_name:
|
||||||
|
prints('Error evaluating column named:', column_name)
|
||||||
ans = error_value + ' ' + e.message
|
ans = error_value + ' ' + e.message
|
||||||
return ans
|
return ans
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user