From 07badb20df4f27eba1ba5c831b9fcc9913de4aa1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 29 Jan 2009 15:20:36 -0800 Subject: [PATCH] IGN:... --- src/calibre/__init__.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 35ef1898ea..34ebeefccf 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -424,20 +424,24 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252'): if isosx: fdir = os.path.expanduser('~/.fonts') - if not os.path.exists(fdir): - os.makedirs(fdir) - if not os.path.exists(os.path.join(fdir, 'LiberationSans_Regular.ttf')): - from calibre.ebooks.lrf.fonts.liberation import __all__ as fonts - for font in fonts: - l = {} - exec 'from calibre.ebooks.lrf.fonts.liberation.'+font+' import font_data' in l - try: - open(os.path.join(fdir, font+'.ttf'), 'wb').write(l['font_data']) - except: - import traceback - traceback.print_exc() - break - + try: + if not os.path.exists(fdir): + os.makedirs(fdir) + except: + pass + else: + if not os.path.exists(os.path.join(fdir, 'LiberationSans_Regular.ttf')): + from calibre.ebooks.lrf.fonts.liberation import __all__ as fonts + for font in fonts: + l = {} + exec 'from calibre.ebooks.lrf.fonts.liberation.'+font+' import font_data' in l + try: + open(os.path.join(fdir, font+'.ttf'), 'wb').write(l['font_data']) + except: + import traceback + traceback.print_exc() + break + # Migrate from QSettings based config system from calibre.utils.config import migrate migrate()