Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up error handling in the linux installer

Browse Source
This commit is contained in:
Kovid Goyal 2014-02-22 13:31:11 +05:30
parent ddca079000
commit c551895b83
1 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/calibre/linux.py
View File

@ -3,7 +3,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
''' Post installation script for linux ''' ''' Post installation script for linux '''
import sys, os, cPickle, textwrap, stat import sys, os, cPickle, textwrap, stat, errno
from subprocess import check_call from subprocess import check_call
from functools import partial from functools import partial
@ -75,11 +75,15 @@ class PreserveMIMEDefaults(object):
except: except:
pass pass
elif os.path.exists(path): elif os.path.exists(path):
with open(path, 'r+b') as f: try:
if f.read() != val: with open(path, 'r+b') as f:
f.seek(0) if f.read() != val:
f.truncate() f.seek(0)
f.write(val) f.truncate()
f.write(val)
except EnvironmentError as e:
if e.errno != errno.EACCES:
raise
# Uninstall script {{{ # Uninstall script {{{
UNINSTALL = '''\ UNINSTALL = '''\
@ -103,6 +107,13 @@ frozen_path = {frozen_path!r}
if not frozen_path or not os.path.exists(os.path.join(frozen_path, 'resources', 'calibre-mimetypes.xml')): if not frozen_path or not os.path.exists(os.path.join(frozen_path, 'resources', 'calibre-mimetypes.xml')):
frozen_path = None frozen_path = None
for f in {mime_resources!r}:
cmd = ['xdg-mime', 'uninstall', f]
print ('Removing mime resource:', os.path.basename(f))
ret = subprocess.call(cmd)
if ret != 0:
print ('WARNING: Failed to remove mime resource', f)
for x in tuple({manifest!r}) + tuple({appdata_resources!r}) + (os.path.abspath(__file__), __file__, frozen_path): for x in tuple({manifest!r}) + tuple({appdata_resources!r}) + (os.path.abspath(__file__), __file__, frozen_path):
if not x or not os.path.exists(x): if not x or not os.path.exists(x):
continue continue
@ -142,13 +153,6 @@ for f in mr:
if ret != 0: if ret != 0:
print ('WARNING: Failed to remove menu item', f) print ('WARNING: Failed to remove menu item', f)
for f in {mime_resources!r}:
cmd = ['xdg-mime', 'uninstall', f]
print ('Removing mime resource:', os.path.basename(f))
ret = subprocess.call(cmd)
if ret != 0:
print ('WARNING: Failed to remove mime resource', f)
print () print ()
if mimetype_icons and raw_input('Remove the ebook format icons? [y/n]:').lower() in ['', 'y']: if mimetype_icons and raw_input('Remove the ebook format icons? [y/n]:').lower() in ['', 'y']:
@ -443,6 +447,7 @@ class PostInstall:
print '\n'+'_'*20, 'WARNING','_'*20 print '\n'+'_'*20, 'WARNING','_'*20
prints(*args, **kwargs) prints(*args, **kwargs)
print '_'*50 print '_'*50
print ('\n')
self.warnings.append((args, kwargs)) self.warnings.append((args, kwargs))
sys.stdout.flush() sys.stdout.flush()
@ -464,20 +469,24 @@ class PostInstall:
os.path.join(self.opts.staging_root, 'etc') os.path.join(self.opts.staging_root, 'etc')
scripts = cPickle.loads(P('scripts.pickle', data=True)) scripts = cPickle.loads(P('scripts.pickle', data=True))
self.manifest = manifest or []
if getattr(sys, 'frozen_path', False): if getattr(sys, 'frozen_path', False):
self.info('Creating symlinks...') if os.access(self.opts.staging_bindir, os.W_OK):
for exe in scripts.keys(): self.info('Creating symlinks...')
dest = os.path.join(self.opts.staging_bindir, exe) for exe in scripts.keys():
if os.path.lexists(dest): dest = os.path.join(self.opts.staging_bindir, exe)
os.unlink(dest) if os.path.lexists(dest):
tgt = os.path.join(getattr(sys, 'frozen_path'), exe) os.unlink(dest)
self.info('\tSymlinking %s to %s'%(tgt, dest)) tgt = os.path.join(getattr(sys, 'frozen_path'), exe)
os.symlink(tgt, dest) self.info('\tSymlinking %s to %s'%(tgt, dest))
os.symlink(tgt, dest)
self.manifest.append(dest)
else:
self.warning(textwrap.fill(
'No permission to write to %s, not creating program launch symlinks,'
' you should ensure that %s is in your PATH or create the symlinks yourself' % (
self.opts.staging_bindir, getattr(sys, 'frozen_path', 'the calibre installation directory'))))
if manifest is None:
manifest = [os.path.abspath(os.path.join(opts.staging_bindir, x)) for x in
scripts.keys()]
self.manifest = manifest
self.icon_resources = [] self.icon_resources = []
self.menu_resources = [] self.menu_resources = []
self.mime_resources = [] self.mime_resources = []
@ -500,13 +509,16 @@ class PostInstall:
os.rmdir(config_dir) os.rmdir(config_dir)
if warn is None and self.warnings: if warn is None and self.warnings:
self.info('There were %d warnings'%len(self.warnings)) self.info('\n\nThere were %d warnings\n'%len(self.warnings))
for args, kwargs in self.warnings: for args, kwargs in self.warnings:
self.info('*', *args, **kwargs) self.info('*', *args, **kwargs)
print print
def create_uninstaller(self): def create_uninstaller(self):
dest = os.path.join(self.opts.staging_bindir, 'calibre-uninstall') base = self.opts.staging_bindir
if not os.access(base, os.W_OK) and getattr(sys, 'frozen_path', False):
base = sys.frozen_path
dest = os.path.join(base, 'calibre-uninstall')
self.info('Creating un-installer:', dest) self.info('Creating un-installer:', dest)
raw = UNINSTALL.format( raw = UNINSTALL.format(
python='/usr/bin/python', euid=os.geteuid(), python='/usr/bin/python', euid=os.geteuid(),
@ -554,10 +566,11 @@ class PostInstall:
f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre') f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
if not os.path.exists(os.path.dirname(f)): if not os.path.exists(os.path.dirname(f)):
os.makedirs(os.path.dirname(f)) os.makedirs(os.path.dirname(f))
bash_comp_dest, zsh_comp_dest = f, None
if zsh.dest: if zsh.dest:
self.info('Installing zsh completion to:', zsh.dest) self.info('Installing zsh completion to:', zsh.dest)
self.manifest.append(zsh.dest) self.manifest.append(zsh.dest)
self.manifest.append(f) zsh_comp_dest = zsh.dest
complete = 'calibre-complete' complete = 'calibre-complete'
if getattr(sys, 'frozen_path', None): if getattr(sys, 'frozen_path', None):
complete = os.path.join(getattr(sys, 'frozen_path'), complete) complete = os.path.join(getattr(sys, 'frozen_path'), complete)
@ -669,11 +682,15 @@ class PostInstall:
complete -o nospace -C %s ebook-convert complete -o nospace -C %s ebook-convert
''')%complete) ''')%complete)
zsh.write() zsh.write()
self.manifest.extend((bash_comp_dest, zsh_comp_dest))
except TypeError as err: except TypeError as err:
if 'resolve_entities' in str(err): if 'resolve_entities' in str(err):
print 'You need python-lxml >= 2.0.5 for calibre' print 'You need python-lxml >= 2.0.5 for calibre'
sys.exit(1) sys.exit(1)
raise raise
except EnvironmentError as e:
if e.errno == errno.EACCES:
self.warning('Failed to setup completion, permission denied')
except: except:
if self.opts.fatal_errors: if self.opts.fatal_errors:
raise raise
@ -755,9 +772,9 @@ class PostInstall:
try: try:
os.mkdir(appdata) os.mkdir(appdata)
except: except:
prints('Failed to create %s not installing appdata files' % appdata) self.warning('Failed to create %s not installing appdata files' % appdata)
if os.path.exists(appdata) and not os.access(appdata, os.W_OK): if os.path.exists(appdata) and not os.access(appdata, os.W_OK):
prints('Do not have write permissions for %s not installing appdata files' % appdata) self.warning('Do not have write permissions for %s not installing appdata files' % appdata)
else: else:
from calibre.utils.localization import get_all_translators from calibre.utils.localization import get_all_translators
translators = dict(get_all_translators()) translators = dict(get_all_translators())